Fix rule for University of Strasbourg
[Windows 7 Forums] Default_off: HTTPS is not responding

https://trac.torproject.org/projects/tor/ticket/8535
[Zend] Mark as mixedcontent

https://trac.torproject.org/projects/tor/ticket/8563
v2ex.com
Add v2ex.com ruleset.
[Ubuntu] Added the login subdomain
Added a partial ruleset for GitCafe
Merge remote-tracking branch 'negres/master'
Merge remote-tracking branch 'meteor/master'
remove lifo.gr since it doesn't correctly support HTTPS any more
Merge remote-tracking branch 'negres/master'
Import Plurk ruleset

This was lurking in a needs_review ticket for a long time...
https://trac.torproject.org/projects/tor/ticket/5802
[Nokia] Add coverage
[Nokia] Cosmetics & comments
[VK] new user-contributed rule for VKontakte; turn off old rule

Thanks to Valery Petrov.
Fixed Chromium HSTS preload list URL

Signed-off-by: Yan <yan@mit.edu>
Merge branch 'master' of git://gitweb.torproject.org/https-everywhere
Merge branch 'master' of https://github.com/diracdeltas/https-everywhere
[GreatFire] new user-contributed rule for GreatFire.org

Thanks to Johan.
[RT] Disable the main Russia Today rule

https://trac.torproject.org/projects/tor/ticket/8630
Merge git://github.com/galenide/https-everywhere

Conflicts:
	src/chrome/content/rules/Ubuntu.xml