Merge default preferences updates from 3.3.1

diracdeltas · diracdeltas · commit b7660b8ce768 · 2013-08-13T16:24:05.000-07:00
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
@@ -1,6 +1,9 @@
 pref("extensions.https_everywhere.LogLevel", 5);
 pref("extensions.https_everywhere.globalEnabled",true);
 
+// this is the HTTPS Everywhere preferences version (for migrations)
+pref("extensions.https_everywhere.prefs_version", 0);
+
 // SSl Observatory preferences
 pref("extensions.https_everywhere._observatory.enabled",false);
 
@@ -20,6 +23,7 @@ pref("extensions.https_everywhere._observatory.popup_shown",false);
 pref("extensions.https_everywhere._observatory.proxy_host","");
 pref("extensions.https_everywhere._observatory.proxy_port",0);
 pref("extensions.https_everywhere._observatory.proxy_type","direct");
+pref("extensions.https_everywhere._observatory.use_tor_proxy",true);
 pref("extensions.https_everywhere._observatory.alt_roots",false);
 pref("extensions.https_everywhere._observatory.self_signed",true);
 pref("extensions.https_everywhere._observatory.priv_dns",false);
