summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2018-01-18 20:45:34 +0100
committeranonym <anonym@riseup.net>2018-01-26 12:35:43 +0100
commitf13eb68ec79bd65ce03066147a41a3c50a14c2a8 (patch)
tree8ae85d6c9ec35eff4709c72f748ecdfbe946624c
parent53131b0a30cb09e8eaf1368cc9f7f02509312eb1 (diff)
Tor Launcher: provide Tor's default Meek bridges.feature/8825-default-meek-bridges
Refs: #8243
-rwxr-xr-xconfig/chroot_local-hooks/10-tbb10
-rw-r--r--config/chroot_local-includes/etc/xul-ext/tor-launcher.js1
2 files changed, 10 insertions, 1 deletions
diff --git a/config/chroot_local-hooks/10-tbb b/config/chroot_local-hooks/10-tbb
index 7153251..a564ca5 100755
--- a/config/chroot_local-hooks/10-tbb
+++ b/config/chroot_local-hooks/10-tbb
@@ -110,6 +110,16 @@ EOF
# in the directory where the firefox executable is located.
mkdir -p "${prep}"/TorBrowser/Data/Browser/Caches
+ set_mozilla_pref /etc/xul-ext/tor-launcher.js \
+ extensions.torlauncher.transportproxy_path \
+ '"/usr/bin/obfs4proxy"'
+ set_mozilla_pref /etc/xul-ext/tor-launcher.js \
+ extensions.torlauncher.default_bridge_recommended_type \
+ '"meek_lite"'
+ # We only want Tor's default Meek pluggable transports, and we use
+ # them as meek_lite instead (#8243).
+ sed --regexp-extended -n 's@pref\("(extensions.torlauncher.default_bridge.meek-[^"]*)", "meek ([^"]*)"\);@pref("\1", "meek_lite \2");@p' "${prep}"/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js >> /etc/xul-ext/tor-launcher.js
+
mv "${prep}" "${destination}"
rm -r "${tmp}"
diff --git a/config/chroot_local-includes/etc/xul-ext/tor-launcher.js b/config/chroot_local-includes/etc/xul-ext/tor-launcher.js
deleted file mode 100644
index 2775bba..0000000
--- a/config/chroot_local-includes/etc/xul-ext/tor-launcher.js
+++ /dev/null
@@ -1 +0,0 @@
-pref("extensions.torlauncher.transportproxy_path", "/usr/bin/obfs4proxy");