commit b06ec8f30f16c59e4e0cb93e18636dbd811a668e Author: Tomas Touceda chiiph@torproject.org Date: Wed Aug 10 15:12:47 2011 -0300

Use the random password if set --- src/vidalia/MainWindow.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index b5a8434..37a8752 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -2040,7 +2040,7 @@ MainWindow::updateBrowserEnv() { }

if(settings.getAuthenticationMethod() == TorSettings::PasswordAuth) { - env << QString("TOR_CONTROL_PASSWD=%1").arg(string_escape(QString(settings.getControlPassword().toAscii().toHex()))); + env << QString("TOR_CONTROL_PASSWD=%1").arg(string_escape(QString(_controlPassword.toAscii().toHex()))); env << QString("TOR_CONTROL_PORT=%1").arg(_autoControlPort); }