commit f6288fccc8c0275f75d16d2afc5ca5437b6f01ff Author: Erinn Clark erinn@torproject.org Date: Mon Aug 29 23:41:51 2011 +0100

add autoport configuration to linux config files --- build-scripts/config/torrc-linux | 3 ++- build-scripts/config/vidalia.conf.ff-linux | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/build-scripts/config/torrc-linux b/build-scripts/config/torrc-linux index 9c6cecd..05f5345 100644 --- a/build-scripts/config/torrc-linux +++ b/build-scripts/config/torrc-linux @@ -8,5 +8,6 @@ GeoIPFile ./Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9050 +SocksPort auto SocksListenAddress 127.0.0.1 +ControlPort auto diff --git a/build-scripts/config/vidalia.conf.ff-linux b/build-scripts/config/vidalia.conf.ff-linux index 94c5503..4535b7b 100644 --- a/build-scripts/config/vidalia.conf.ff-linux +++ b/build-scripts/config/vidalia.conf.ff-linux @@ -8,3 +8,5 @@ LanguageCode=en ControlPort=9051 TorExecutable=./App/tor Torrc=./Data/Tor/torrc +AutoControl=true +DataDirectory=./Data/Tor