commit bebb0e7ef4f2a6ed3591a772334f585f9406ef7c Author: Erinn Clark erinn@torproject.org Date: Tue Jan 31 18:26:53 2012 +0100

update vidalia config files for alpha bundles --- build-scripts/config/alpha/vidalia.conf.ff | 7 +++++-- build-scripts/config/alpha/vidalia.conf.ff-linux | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build-scripts/config/alpha/vidalia.conf.ff b/build-scripts/config/alpha/vidalia.conf.ff index d03289e..58036b5 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff +++ b/build-scripts/config/alpha/vidalia.conf.ff @@ -1,6 +1,5 @@ [General] -BrowserDirectory=FirefoxPortable -BrowserExecutable=tbb-firefox.exe +PluginPath=.\Data\Vidalia\plugins LanguageCode=en

[Tor] @@ -8,3 +7,7 @@ ControlPort=9051 TorExecutable=.\App\tor.exe Torrc=.\Data\Tor\torrc DataDirectory=.\Data\Tor + +[TBB] +BrowserDirectory=FirefoxPortable +BrowserExecutable=tbb-firefox.exe diff --git a/build-scripts/config/alpha/vidalia.conf.ff-linux b/build-scripts/config/alpha/vidalia.conf.ff-linux index 4535b7b..a62f09a 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-linux +++ b/build-scripts/config/alpha/vidalia.conf.ff-linux @@ -1,6 +1,4 @@ [General] -BrowserDirectory=. -BrowserExecutable=firefox InterfaceStyle=Cleanlooks LanguageCode=en

@@ -10,3 +8,7 @@ TorExecutable=./App/tor Torrc=./Data/Tor/torrc AutoControl=true DataDirectory=./Data/Tor + +[TBB] +BrowserDirectory=. +BrowserExecutable=firefox