Merge remote-tracking branch 'pde-github/stable' into 3.0
Merge remote-tracking branch 'pde-github/3.0' into 3.0
Merge remote-tracking branch 'pde-github/3.0' into 3.0
Version bump to 3.4 instead
Fix typo resulting in variable leak in get_prefs(), thanks to Jérémy Bobbio
Version bump to 3.4.1 and updated Changelog
Don't double count *.example.com
Fix unsafe loop variables (thanks to backflash)
Avoid global variable leaks
Merge remote-tracking branch 'upstream/3.0' into 3.0
This should fix craigslist.org

There are some language specific 4th level subdomains that are not covered
under the *.craigslist.org wildcard cert.  This commit adds an exclusion for
all those domains.
Refactor Christopher's patch.
Merge remote-tracking branch 'upstream/3.0' into 3.0
[Craigslist.org] Exclude blog
[Apple.com] Downgrade trailers.apple.com to avoid mismatch
[Microsoft] Add mixedcontent rule for blogs.msdn.com
[Microsoft] Moved www.microsoft.com to [Microsoft-mixedcontent] rule
https://trac.torproject.org/projects/tor/ticket/9305

Conflicts:
	src/chrome/content/rules/Microsoft.xml
[Cloudfront] Exclusion for Amazon mp3s

https://trac.torproject.org/projects/tor/ticket/9367
[UKLocalGov] Remove reading rule, see #8783
Merge remote-tracking branch 'upstream/3.0' into 3.0