Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
[Skype] Remove exclusion

Seems not to be needed now.
[Fastmail] Don't force !www
[University of Exeter] Handle newton separately

newton.exeter.ac.uk doesn't exist, newton.ex.ac.uk works fine as-is.

https://trac.torproject.org/projects/tor/ticket/8853
[Linaro] Cosmetics
[Attachmate Group] Split Novell
[PortableApps.com] Remove, broken

CDN moved to NetDNA, portableappscdn.rareideasllc.netdna-cdn.com

portableappscdn-rareideasllc.netdna-ssl.com does not exist.
[The Diplomat] Comment out exclusions

Appears to have stopped redirecting to http.
[Myspace] reportedly mixed content
Merge remote-tracking branch 'tk-999/master'
Update cert whitelist
New translations: Japanese and Sinhala
Update Hungarian translation
Update Lithuanian and Slovenian translations from Transifex
[Apple-mixed] Unbreak support!

Conflicts:
	src/chrome/content/rules/Apple-mixed.xml
[Siggraph] broken, disable.
[Panasonic] flag mixed content
[OpenStreetMap Wiki] breaks new editor, default off

https://trac.torproject.org/projects/tor/ticket/8841
Removing yandex.st fixes maps.yandex.ru