default off per webmaster request
Merge branch '3.0' of git://gitweb.torproject.org/https-everywhere into 3.0

Conflicts:
	src/chrome/content/rules/Avast.com.xml
Merge remote-tracking branch 'origin/stable' into 3.0
Merge remote-tracking branch 'origin/3.0' into 3.0