commit 3f32f7a6dd4970936cc49d988369a61efa87c031 Author: Kathy Brade <brade@pearlcrescent.com> Date: Tue Jan 31 11:49:41 2017 -0500 Bug 20761: Tor Browser 6.5a4 is ignoring additional SocksPorts Remove the SocksPort and ControlPort configuration from torrc-defaults. Tor Launcher configures the ports via args when starting tor, and we must avoid conflicts. Also, strengthen the warning to users about not editing torrc-defaults. --- Bundle-Data/linux/Data/Tor/torrc-defaults | 8 +++----- Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 8 +++----- Bundle-Data/windows/Data/Tor/torrc-defaults | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index 0a87e5f..f383525 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -1,6 +1,8 @@ # torrc-defaults for Tor Browser # -# This file is distributed with Tor Browser and should not be modified (it +# DO NOT EDIT THIS FILE +# +# This file is distributed with Tor Browser and SHOULD NOT be modified (it # may be overwritten during the next Tor Browser update). To customize your # Tor configuration, shut down Tor Browser and edit the torrc file. # @@ -9,8 +11,4 @@ AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity] # (stderr|stdout|syslog|file FILENAME). Log notice stdout -# Bind to this address to listen to connections from SOCKS-speaking -# applications. -SocksPort 9150 IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth -ControlPort 9151 CookieAuthentication 1 diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults index 0a87e5f..f383525 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults @@ -1,6 +1,8 @@ # torrc-defaults for Tor Browser # -# This file is distributed with Tor Browser and should not be modified (it +# DO NOT EDIT THIS FILE +# +# This file is distributed with Tor Browser and SHOULD NOT be modified (it # may be overwritten during the next Tor Browser update). To customize your # Tor configuration, shut down Tor Browser and edit the torrc file. # @@ -9,8 +11,4 @@ AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity] # (stderr|stdout|syslog|file FILENAME). Log notice stdout -# Bind to this address to listen to connections from SOCKS-speaking -# applications. -SocksPort 9150 IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth -ControlPort 9151 CookieAuthentication 1 diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index 0a87e5f..f383525 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -1,6 +1,8 @@ # torrc-defaults for Tor Browser # -# This file is distributed with Tor Browser and should not be modified (it +# DO NOT EDIT THIS FILE +# +# This file is distributed with Tor Browser and SHOULD NOT be modified (it # may be overwritten during the next Tor Browser update). To customize your # Tor configuration, shut down Tor Browser and edit the torrc file. # @@ -9,8 +11,4 @@ AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity] # (stderr|stdout|syslog|file FILENAME). Log notice stdout -# Bind to this address to listen to connections from SOCKS-speaking -# applications. -SocksPort 9150 IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth -ControlPort 9151 CookieAuthentication 1