summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-07-03 19:05:32 +0000
committerintrigeri <intrigeri@boum.org>2018-07-03 20:04:25 +0000
commitb65f1e565780478e0d6e7e2e6d7ebec9530b9fab (patch)
tree26ac2d7a67031d30cc2e296d681030275d60bf0d
parent7afb7fd2c21f184e0232d11f70aa2196ab8c63c3 (diff)
Make extensions.torbutton.launch_warning be taken into account (refs: #15707)
For some reason, it's ignored when we set it via /usr/share/tails/tor-browser-prefs.js.
-rw-r--r--config/chroot_local-includes/etc/tor-browser/profile/prefs.js3
-rw-r--r--config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js1
2 files changed, 3 insertions, 1 deletions
diff --git a/config/chroot_local-includes/etc/tor-browser/profile/prefs.js b/config/chroot_local-includes/etc/tor-browser/profile/prefs.js
new file mode 100644
index 0000000..d904749
--- /dev/null
+++ b/config/chroot_local-includes/etc/tor-browser/profile/prefs.js
@@ -0,0 +1,3 @@
+// Prefs that *need* to be here because they are not honored
+// if we set them via /usr/share/tails/tor-browser-prefs.js
+user_pref("extensions.torbutton.launch_warning", false);
diff --git a/config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js b/config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js
index d527ec1..ef9dcca 100644
--- a/config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js
+++ b/config/chroot_local-includes/usr/share/tails/tor-browser-prefs.js
@@ -1,7 +1,6 @@
// As suggested in TBB's start-tor-browser script for system-wide Tor
// instances
pref("network.security.ports.banned", "631,6136,4444,4445,6668,7656,7657,7658,7659,7660,8998,9040,9050,9062,9150,9051");
-pref("extensions.torbutton.launch_warning", false);
// Tails-specific configuration below