[tor-commits] [tor-messenger-build/master] Remove obsolete patching of torrc-defaults

arlo at torproject.org arlo at torproject.org
Thu Jul 28 23:52:35 UTC 2016


commit b23115185109cf06cfe6a107c928de4e1d8a9533
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Mon Jul 11 12:19:36 2016 -0400

    Remove obsolete patching of torrc-defaults
---
 projects/tor-messenger/build | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index f50c490..d69c983 100755
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -73,14 +73,10 @@ 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|TorBrowser\\Tor\\PluggableTransports|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
 [% ELSE -%]
 # 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|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
 [% END -%]
 





More information about the tor-commits mailing list