summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-03-01 11:45:50 +0100
committerTails developers <amnesia@boum.org>2012-03-01 11:45:50 +0100
commit69c017a299f3ea4bd824b54798240482544926ab (patch)
tree7400de03e34dc57ff6fea250785fe62bbf17c9f3
parent557fe908365d9dc68bb82eeb4ddd77832eaf076f (diff)
parentedd32ad941e98a4e9db17b6555e0904874308792 (diff)
Merge branch 'bugfix/disable_ssl_observatory' into stable
-rw-r--r--config/chroot_local-includes/etc/iceweasel/profile/user.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/chroot_local-includes/etc/iceweasel/profile/user.js b/config/chroot_local-includes/etc/iceweasel/profile/user.js
index c9f7687..1e95931 100644
--- a/config/chroot_local-includes/etc/iceweasel/profile/user.js
+++ b/config/chroot_local-includes/etc/iceweasel/profile/user.js
@@ -5,6 +5,9 @@ user_pref("extensions.adblockplus.showinaddonbar", false);
user_pref("extensions.adblockplus.showintoolbar", false);
user_pref("extensions.adblockplus.subscriptions_autoupdate", false);
+user_pref("extensions.https_everywhere._observatory.enabled", false);
+user_pref("extensions.https_everywhere._observatory.popup_shown", true);
+
// Block read and write access to the history in non-Tor mode
user_pref("extensions.torbutton.block_nthread", true);
user_pref("extensions.torbutton.block_nthwrite", true);