commit 77b5803f63bd2ef8106d4098c989e43e9fa1b27e Author: Erinn Clark erinn@torproject.org Date: Sun Jul 29 21:05:02 2012 +0100

make sure tbb alpha vidalia configs work for vidalia 0.2.20 --- build-scripts/config/alpha/vidalia.conf.ff-linux | 17 +++++++++-------- build-scripts/config/alpha/vidalia.conf.ff-osx | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/build-scripts/config/alpha/vidalia.conf.ff-linux b/build-scripts/config/alpha/vidalia.conf.ff-linux index b5c6aa6..26c66be 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-linux +++ b/build-scripts/config/alpha/vidalia.conf.ff-linux @@ -1,15 +1,16 @@ [General] +BrowserDirectory=./Firefox +BrowserExecutable=firefox InterfaceStyle=Cleanlooks LanguageCode=en -PluginPath=./Data/Vidalia/plugins +ProfileDirectory=../../Data/profile +DefaultProfileDirectory=./defaults/profile +PluginsDirectory=../../Data/profile/extensions +DefaultPluginsDirectory=./extensions

[Tor] ControlPort=9051 -TorExecutable=./App/tor -Torrc=./Data/Tor/torrc +TorExecutable=./tor +Torrc=../Data/Tor/torrc AutoControl=true -DataDirectory=./Data/Tor - -[TBB] -BrowserDirectory=. -BrowserExecutable=firefox +DataDirectory=../Data/Tor diff --git a/build-scripts/config/alpha/vidalia.conf.ff-osx b/build-scripts/config/alpha/vidalia.conf.ff-osx index a02a7dc..f698d2b 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff-osx +++ b/build-scripts/config/alpha/vidalia.conf.ff-osx @@ -1,14 +1,15 @@ [General] -PluginPath=../../Library/Vidalia/plugins +BrowserDirectory=../../../ +BrowserExecutable=TorBrowser.app/Contents/MacOS/firefox-bin +ProfileDirectory=../../Library/Application Support/Firefox/Profiles/profile +DefaultProfileDirectory=TorBrowser.app/Contents/MacOS/defaults/profile +PluginsDirectory=../../MacOS/Data/plugins +DefaultPluginsDirectory=../../MacOS/Data/plugins LanguageCode=en

[Tor] ControlPort=9051 -TorExecutable=../../Contents/MacOS/tor -Torrc=../../Library/Vidalia/torrc +TorExecutable=../../../tor +Torrc=../../../../../Library/Vidalia/torrc AutoControl=true -DataDirectory=../../Contents/Resources/Data/Tor - -[TBB] -BrowserDirectory=../../ -BrowserExecutable=firefox-bin +DataDirectory=../../../../Resources/Data/Tor/