commit ec063b9c4f4dddab13fd0f65fb27048450c86344 Author: Nicolas Vigier <boklm@torproject.org> Date: Mon Nov 9 00:13:14 2015 +0100 Use meek in standalone mode Also, don't remove meek from the default bridges, now that it works. https://lists.torproject.org/pipermail/tor-dev/2015-November/009887.html --- projects/tor-messenger/build | 5 +++-- projects/tor-messenger/build.osx | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 19de0af..323141b 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -52,8 +52,7 @@ tar xf ../../../[% c('input_files_by_name/ctypes-otr') %] mv ctypes-otr* 'ctypes-otr@tormessenger' mkdir tor-launcher@torproject.org 7z x -y -otor-launcher@torproject.org ../../../[% c('input_files_by_name/tor-launcher') %] -# exclude meek as it requires firefox -fgrep -v extensions.torlauncher.default_bridge.meek- $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ +cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ tor-launcher@torproject.org/defaults/preferences/prefs.js mkdir -p tor-launcher@torproject.org/TorBrowser/Data [% IF c("var/windows") -%] @@ -65,6 +64,8 @@ tar xf ../../../[% c('input_files_by_name/tor-browser') %] [% END -%] sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults +# use meek in standalone mode: https://lists.torproject.org/pipermail/tor-dev/2015-November/009887.html +sed -i 's/\(ClientTransportPlugin meek exec\) [^ ]\+ -- /\1 /' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults sed -i 's|TorBrowser/Tor/PluggableTransports|extensions/tor-launcher@torproject.org/TorBrowser/Tor/PluggableTransports|g' \ tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults sed -i 's|TorBrowser\\Tor\\PluggableTransports|extensions\\tor-launcher@torproject.org\\TorBrowser\\Tor\\PluggableTransports|g' \ diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 1c79518..15ff911 100644 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -14,13 +14,14 @@ mkdir torbrowser cd torbrowser mkdir tor-launcher@torproject.org 7z x -y -otor-launcher@torproject.org $rootdir/[% c('input_files_by_name/tor-launcher') %] -# exclude meek as it requires firefox -fgrep -v extensions.torlauncher.default_bridge.meek- $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ +cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ tor-launcher@torproject.org/defaults/preferences/prefs.js 7z x $rootdir/[% c('input_files_by_name/tor-browser') %] bsdtar xf '0.unknown partition' sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults +# use meek in standalone mode: https://lists.torproject.org/pipermail/tor-dev/2015-November/009887.html +sed -i 's/\(ClientTransportPlugin meek exec\) [^ ]\+ -- /\1 /' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults mkdir -p tor-launcher@torproject.org/TorBrowser/Data mv TorBrowser.app/TorBrowser/Tor tor-launcher@torproject.org/TorBrowser/Tor mv TorBrowser.app/TorBrowser/Data/Tor tor-launcher@torproject.org/TorBrowser/Data/Tor