commit 60b595602fb39638c7084474a4b8a6f63ceb24aa Author: Arlo Breault arlolra@gmail.com Date: Thu Nov 19 11:18:52 2015 -0800

fixup! Remove TorBrowser.app.meek-http-helper from bundle --- projects/tor-messenger/build | 2 -- projects/tor-messenger/build.osx | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 069ae3b..3d0ef0d 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -70,8 +70,6 @@ sed -i 's|TorBrowser/Tor/PluggableTransports|extensions/tor-launcher@torproject. 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 -# trac 17476 -rm -Rf tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/TorBrowser.app.meek-http-helper/ rm -f tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser mv tor-browser_en-US/Browser/TorBrowser/Tor tor-launcher@torproject.org/TorBrowser/Tor mv tor-browser_en-US/Browser/TorBrowser/Data/Tor tor-launcher@torproject.org/TorBrowser/Data/Tor diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx old mode 100644 new mode 100755 index 15ff911..99dc5a2 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -23,6 +23,9 @@ sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' TorBrows # 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 +# trac 17476 +rm -Rf TorBrowser.app/TorBrowser/Tor/PluggableTransports/TorBrowser.app.meek-http-helper/ +rm -f TorBrowser.app/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser mv TorBrowser.app/TorBrowser/Tor tor-launcher@torproject.org/TorBrowser/Tor mv TorBrowser.app/TorBrowser/Data/Tor tor-launcher@torproject.org/TorBrowser/Data/Tor mv tor-launcher@torproject.org $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/