Fixed mixed content blocking detection on older versions of Firefox that don't have it turned on
Revert "More changes from master", which introduced a couple of bugs

This reverts commit ecf7f59a9cf65ea7a877191b7cd1823bf4b80164.

Conflicts:

	src/chrome/content/about.xul
	src/install.rdf
Merge changelog from master
Changelog for 2013.8.17
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