Unverified Commit 6395f3e3 authored Jan 31, 2017 by Kathleen Brade Committed by boklm May 12, 2017

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.

parent 747b697d

projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults

+3 −5

Original line number	Diff line number	Diff line
		# 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

projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults

+3 −5

Original line number	Diff line number	Diff line
		# 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

projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults

+3 −5

Original line number	Diff line number	Diff line
		# 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