[tor-commits] [tor-messenger-build/master] Remove meek's terminateprocess-buffer

[arlo at torproject.org]

commit b848ac97d7f17f797fae7dc87c1ef1ced93563e1
Author: Arlo Breault <arlolra at gmail.com>
Date:   Thu Nov 19 15:35:14 2015 -0800

    Remove meek's terminateprocess-buffer
    
     * Doesn't seem to be necessary for standalone mode and prevent
       meek-client.exe from shutting down cleanly on exit.
---
 projects/tor-messenger/build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index f5de5e3..8006deb 100755
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -67,7 +67,7 @@ sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' tor-brow
 
 [% IF c("var/windows") -%]
 # 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/\(ClientTransportPlugin meek exec\) [^ ]\+ [^ ]\+ -- /\1 /' 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
 rm -f  tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser.exe