Commit 11dc8622 authored by Mike Perry's avatar Mike Perry Committed by Erinn Clark
Browse files

Make the SOCKS and Control ports fixed at 915x on all platforms. 

It turns out Firefox 17 caches proxy settings somewhere for requests. Changing
them at startup produces a race condition for the Tor test in
HTTPS-Everywhere's SSL observatory. If HTTPS-Everywhere tests
check.torproject.org before we managed to set our socks port to the new auto
value, check.torproject.org fails to ever work again (with a proxy unreachable
error).

We could fix this in HTTPS-Everywhere, I guess, but this fix is simpler and
deals with the root issue, and will also make it easier to make Vidalia an
optional download at a later date.

Note I only changed the alpha config files here... We'll need to backport
this/copy them somehow for TBB-stable.
parent 8381c2ad

build-scripts/config/alpha/torrc

+2 −0
Original line number Diff line number Diff line
@@ -9,3 +9,5 @@ Log notice stdout 
# Bind to this address to listen to connections from SOCKS-speaking

# applications.

SocksListenAddress 127.0.0.1

SocksPort 9150

ControlPort 9151

build-scripts/config/alpha/torrc-linux

+2 −2
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ GeoIPFile ./Data/Tor/geoip 
Log notice stdout

# Bind to this address to listen to connections from SOCKS-speaking

# applications.

SocksPort auto

SocksListenAddress 127.0.0.1

ControlPort auto
 
SocksPort 9150

ControlPort 9151

build-scripts/config/alpha/torrc-obfsproxy

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ Log notice stdout 
# Bind to this address to listen to connections from SOCKS-speaking

# applications.

SocksListenAddress 127.0.0.1

SocksPort 9150

ControlPort 9151



UseBridges 1

build-scripts/config/alpha/torrc-obfsproxy-linux

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ GeoIPFile ./Data/Tor/geoip 
Log notice stdout

# Bind to this address to listen to connections from SOCKS-speaking

# applications.

SocksPort auto

SocksListenAddress 127.0.0.1

ControlPort auto

SocksPort 9150

ControlPort 9151



UseBridges 1

build-scripts/config/alpha/torrc-obfsproxy-osx

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ GeoIPFile ../../Contents/Resources/Data/Tor/geoip 
Log notice stdout

# Bind to this address to listen to connections from SOCKS-speaking

# applications.

SocksPort auto

SocksListenAddress 127.0.0.1

ControlPort auto

SocksPort 9150

ControlPort 9151



UseBridges 1