Fixed mixed content blocking detection on older versions of Firefox that don't have it turned on
Merge remote-tracking branch 'pde-github/stable' into 3.0
Start preparing for 3.3.3 urgent bugfix
Begin changelog for 3.3.3
Merge remote-tracking branch 'pde-github/3.0' into 3.0
Merge branch '3.0' of https://git.torproject.org/https-everywhere into 3.0
Added foundation for displaying a rulesets applied counter
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