commit 7f52d9f085536f178fed1a2541c38fb6a61bdcb3 Author: Erinn Clark erinn@torproject.org Date: Tue Aug 30 00:27:58 2011 +0100

give all platforms' vidalia.conf a DataDirectory so users don't accidentally configure auto port choosing and get bitten by Vidalia's inability to write a port.conf (see #3843) --- build-scripts/config/vidalia.conf.ff | 1 + build-scripts/config/vidalia.conf.ff-linux | 1 + build-scripts/config/vidalia.conf.ff-osx | 1 + 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff index ef312a8..5875d2e 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -10,3 +10,4 @@ RunProxyAtStart=true ControlPort=9051 TorExecutable=.\App\tor.exe Torrc=.\Data\Tor\torrc +DataDirectory=.\Data\Tor diff --git a/build-scripts/config/vidalia.conf.ff-linux b/build-scripts/config/vidalia.conf.ff-linux index 998be98..e9c5d06 100644 --- a/build-scripts/config/vidalia.conf.ff-linux +++ b/build-scripts/config/vidalia.conf.ff-linux @@ -7,3 +7,4 @@ LanguageCode=en ControlPort=9051 TorExecutable=./App/tor Torrc=./Data/Tor/torrc +DataDirectory=./Data/Tor diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx index c038242..45f2d41 100644 --- a/build-scripts/config/vidalia.conf.ff-osx +++ b/build-scripts/config/vidalia.conf.ff-osx @@ -10,3 +10,4 @@ RunProxyAtStart=true ControlPort=9051 TorExecutable=../../Contents/MacOS/tor Torrc=../../Library/Vidalia/torrc +DataDirectory=../../Contents/Resources/Data/Tor