[tor-commits] [tor-messenger-build/master] Remove TorBrowser.app.meek-http-helper from bundle

[arlo at torproject.org]

commit dd5be9702b635cfcf0a6fc3dac5205eafef09e3c
Author: Arlo Breault <arlolra at gmail.com>
Date:   Thu Nov 19 09:54:18 2015 -0800

    Remove TorBrowser.app.meek-http-helper from bundle
    
     * Fixes trac 17476
    
     * Also, remove meek-client-torbrowser since we're not using it and it's
       just cruft in the build.
---
 projects/tor-messenger/build |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
old mode 100644
new mode 100755
index 323141b..069ae3b
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -70,6 +70,9 @@ sed -i 's|TorBrowser/Tor/PluggableTransports|extensions/tor-launcher at torproject.
                 tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults
 sed -i 's|TorBrowser\\Tor\\PluggableTransports|extensions\\tor-launcher at 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 at torproject.org/TorBrowser/Tor
 mv tor-browser_en-US/Browser/TorBrowser/Data/Tor tor-launcher at torproject.org/TorBrowser/Data/Tor
 rm -Rf tor-browser_en-US