Add SSL DebConf domains to the Debian set
Merge branch 'master' of git://gitweb.torproject.org/https-everywhere
Improve lossless compression on .PNGs
Merge remote-tracking branch 'neheb/master'
Merge remote-tracking branch 'negres/master'
Exclude http://berlin.de

https://berlin.de requires HTTP authentication
Unbreak the Internet Archives stats pages

The graphite images are not available over HTTPS
Unbreak wrzru by adding a slash
Unbreak KickAssVPS by properly escaping a dot
Unbreak HostBill by properly escaping a dot
Unbreak morpho.hu by making it valid XML and adding a slash
Merge branch 'wieland'

Conflicts:
	src/chrome/content/rules/HostBill.xml
	src/chrome/content/rules/KickAssVPS.com.xml
	src/chrome/content/rules/Morpho.hu.xml
	src/chrome/content/rules/wrzru.xml
Update contributors
[NYTimes] disable securecookie to unbreak discussion on subdomains

https://trac.torproject.org/projects/tor/ticket/7690

Conflicts:
	src/chrome/content/rules/NYTimes.xml
[American Public Media] needed to be renamed for off-by-default
disable per https://trac.torproject.org/projects/tor/ticket/7650
break out .jp redirection per https://trac.torproject.org/projects/tor/ticket/8349
coverage of sourceforge.jp is going to be very partial
Why check the same ruleset more than once?
Update cert whitelist