commit 423c8ef79e9d47f2302bc7a8c78b9775084b01ab Author: Erinn Clark <erinn@torproject.org> Date: Mon Oct 22 16:18:42 2012 +0100 Revert "temporarily switch OSX and Linux to fixed ports" This reverts commit 3bb947a1a92cc3e4f3e1e8823452799b9d309c5a. --- build-scripts/config/alpha/torrc-linux | 2 ++ build-scripts/config/alpha/torrc-obfsproxy-linux | 2 ++ build-scripts/config/alpha/torrc-obfsproxy-osx | 2 ++ build-scripts/config/alpha/torrc-osx | 2 ++ build-scripts/config/alpha/vidalia.conf.ff-linux | 1 + .../config/alpha/vidalia.conf.ff-obfsproxy-linux | 1 + .../config/alpha/vidalia.conf.ff-obfsproxy-osx | 1 + build-scripts/config/alpha/vidalia.conf.ff-osx | 1 + 8 files changed, 12 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/alpha/torrc-linux b/build-scripts/config/alpha/torrc-linux index 70731eb..05f5345 100644 --- a/build-scripts/config/alpha/torrc-linux +++ b/build-scripts/config/alpha/torrc-linux @@ -8,4 +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 diff --git a/build-scripts/config/alpha/torrc-obfsproxy-linux b/build-scripts/config/alpha/torrc-obfsproxy-linux index 6da8871..59ca799 100644 --- a/build-scripts/config/alpha/torrc-obfsproxy-linux +++ b/build-scripts/config/alpha/torrc-obfsproxy-linux @@ -8,7 +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 UseBridges 1 diff --git a/build-scripts/config/alpha/torrc-obfsproxy-osx b/build-scripts/config/alpha/torrc-obfsproxy-osx index 6310dca..80d343d 100644 --- a/build-scripts/config/alpha/torrc-obfsproxy-osx +++ b/build-scripts/config/alpha/torrc-obfsproxy-osx @@ -8,7 +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 UseBridges 1 diff --git a/build-scripts/config/alpha/torrc-osx b/build-scripts/config/alpha/torrc-osx index 984fbfe..4c7f0d9 100644 --- a/build-scripts/config/alpha/torrc-osx +++ b/build-scripts/config/alpha/torrc-osx @@ -8,4 +8,6 @@ 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 diff --git a/build-scripts/config/alpha/vidalia.conf.ff-linux b/build-scripts/config/alpha/vidalia.conf.ff-linux index 402e7f4..26c66be 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-linux +++ b/build-scripts/config/alpha/vidalia.conf.ff-linux @@ -12,4 +12,5 @@ DefaultPluginsDirectory=./extensions ControlPort=9051 TorExecutable=./tor Torrc=../Data/Tor/torrc +AutoControl=true DataDirectory=../Data/Tor diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux index 73e6ea9..cb97dc2 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux @@ -12,6 +12,7 @@ DefaultPluginsDirectory=./extensions ControlPort=9051 TorExecutable=./tor Torrc=../Data/Tor/torrc +AutoControl=true DataDirectory=../Data/Tor [Network] diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx index 5a4f6d6..833fbe4 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx @@ -11,6 +11,7 @@ LanguageCode=en ControlPort=9051 TorExecutable=../../../tor Torrc=../../../../../Library/Vidalia/torrc +AutoControl=true DataDirectory=../../../../Resources/Data/Tor/ [Network] diff --git a/build-scripts/config/alpha/vidalia.conf.ff-osx b/build-scripts/config/alpha/vidalia.conf.ff-osx index d501c5f..f698d2b 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-osx +++ b/build-scripts/config/alpha/vidalia.conf.ff-osx @@ -11,4 +11,5 @@ LanguageCode=en ControlPort=9051 TorExecutable=../../../tor Torrc=../../../../../Library/Vidalia/torrc +AutoControl=true DataDirectory=../../../../Resources/Data/Tor/