commit 5fe7b8d65507ef9d398abdbb24d478b3a92bf5a6 Author: Nicolas Vigier boklm@torproject.org Date: Sat Nov 7 01:02:14 2015 +0100

Fix path to pluggable transports in torrc-defaults on Linux and Windows --- projects/tor-messenger/build | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 7dba35b..19de0af 100644 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -65,6 +65,10 @@ tar xf ../../../[% c('input_files_by_name/tor-browser') %] [% END -%] sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' 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 +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 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 rm -Rf tor-browser_en-US