[tor-commits] [tor-messenger-build/master] fixup! fixup! Use meek in standalone mode

[arlo@xxxxxxxxxxxxxx]

commit 3eaa2148b614d61009345c672a5ced7e4d7c5041
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Thu Nov 19 14:21:21 2015 -0800

    fixup! fixup! Use meek in standalone mode
---
 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 62c215b..f5de5e3 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 extensions\\tor-launcher@xxxxxxxxxxxxxx\\TorBrowser\\Tor\\PluggableTransports\\terminateprocess-buffer\) [^ ]\+ -- /\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@xxxxxxxxxxxxxx\\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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits