- tor-commits - lists.torproject.org

[vidalia/master] Merge remote-tracking branch 'runa/master'
by chiiph＠torproject.org 12 Aug '11

12 Aug '11

commit ca275e302f8b17c669c0377432e1d31784b86701 Merge: 53567a2 394c229 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Wed Aug 10 09:42:29 2011 -0300 Merge remote-tracking branch 'runa/master' pkg/win32/po/af/vidalia_af.po | 2 +- pkg/win32/po/ak/vidalia_ak.po | 2 +- pkg/win32/po/am/vidalia_am.po | 2 +- pkg/win32/po/ar/vidalia_ar.po | 2 +- pkg/win32/po/arn/vidalia_arn.po | 2 +- pkg/win32/po/ast/vidalia_ast.po | 2 +- pkg/win32/po/az/vidalia_az.po | 2 +- pkg/win32/po/bg/vidalia_bg.po | 2 +- pkg/win32/po/bn_IN/vidalia_bn_IN.po | 2 +- pkg/win32/po/ca/vidalia_ca.po | 2 +- pkg/win32/po/cs/vidalia_cs.po | 2 +- pkg/win32/po/csb/vidalia_csb.po | 2 +- pkg/win32/po/de/vidalia_de.po | 2 +- pkg/win32/po/de_CH/vidalia_de_CH.po | 2 +- pkg/win32/po/dz/vidalia_dz.po | 2 +- pkg/win32/po/eo/vidalia_eo.po | 2 +- pkg/win32/po/es/vidalia_es.po | 2 +- pkg/win32/po/et/vidalia_et.po | 2 +- pkg/win32/po/eu/vidalia_eu.po | 2 +- pkg/win32/po/fil/vidalia_fil.po | 2 +- pkg/win32/po/fur/vidalia_fur.po | 2 +- pkg/win32/po/ga/vidalia_ga.po | 2 +- pkg/win32/po/gl/vidalia_gl.po | 2 +- pkg/win32/po/gu/vidalia_gu.po | 2 +- pkg/win32/po/gun/vidalia_gun.po | 2 +- pkg/win32/po/ha/vidalia_ha.po | 2 +- pkg/win32/po/he/vidalia_he.po | 2 +- pkg/win32/po/hi/vidalia_hi.po | 2 +- pkg/win32/po/hr/vidalia_hr.po | 2 +- pkg/win32/po/ht/vidalia_ht.po | 2 +- pkg/win32/po/hu/vidalia_hu.po | 2 +- pkg/win32/po/id/vidalia_id.po | 2 +- pkg/win32/po/is/vidalia_is.po | 2 +- pkg/win32/po/it/vidalia_it.po | 2 +- pkg/win32/po/kn/vidalia_kn.po | 2 +- pkg/win32/po/lb/vidalia_lb.po | 2 +- pkg/win32/po/ln/vidalia_ln.po | 2 +- pkg/win32/po/lo/vidalia_lo.po | 2 +- pkg/win32/po/lt/vidalia_lt.po | 2 +- pkg/win32/po/lv/vidalia_lv.po | 2 +- pkg/win32/po/mg/vidalia_mg.po | 2 +- pkg/win32/po/mi/vidalia_mi.po | 2 +- pkg/win32/po/mk/vidalia_mk.po | 2 +- pkg/win32/po/ml/vidalia_ml.po | 2 +- pkg/win32/po/mn/vidalia_mn.po | 2 +- pkg/win32/po/mr/vidalia_mr.po | 2 +- pkg/win32/po/ms/vidalia_ms.po | 2 +- pkg/win32/po/mt/vidalia_mt.po | 2 +- pkg/win32/po/my/vidalia_my.po | 2 +- pkg/win32/po/nah/vidalia_nah.po | 2 +- pkg/win32/po/nap/vidalia_nap.po | 2 +- pkg/win32/po/nb/vidalia_nb.po | 2 +- pkg/win32/po/ne/vidalia_ne.po | 2 +- pkg/win32/po/nl/vidalia_nl.po | 2 +- pkg/win32/po/nn/vidalia_nn.po | 2 +- pkg/win32/po/nso/vidalia_nso.po | 2 +- pkg/win32/po/oc/vidalia_oc.po | 2 +- pkg/win32/po/pa/vidalia_pa.po | 2 +- pkg/win32/po/pap/vidalia_pap.po | 2 +- pkg/win32/po/pl/vidalia_pl.po | 2 +- pkg/win32/po/pms/vidalia_pms.po | 2 +- pkg/win32/po/ps/vidalia_ps.po | 2 +- pkg/win32/po/pt/vidalia_pt.po | 2 +- pkg/win32/po/pt_BR/vidalia_pt_BR.po | 2 +- pkg/win32/po/sco/vidalia_sco.po | 2 +- pkg/win32/po/son/vidalia_son.po | 2 +- pkg/win32/po/su/vidalia_su.po | 2 +- pkg/win32/po/sw/vidalia_sw.po | 2 +- pkg/win32/po/ta/vidalia_ta.po | 2 +- pkg/win32/po/te/vidalia_te.po | 2 +- pkg/win32/po/tg/vidalia_tg.po | 2 +- pkg/win32/po/th/vidalia_th.po | 2 +- pkg/win32/po/ti/vidalia_ti.po | 2 +- pkg/win32/po/tk/vidalia_tk.po | 2 +- pkg/win32/po/tr/vidalia_tr.po | 2 +- pkg/win32/po/ur/vidalia_ur.po | 2 +- pkg/win32/po/ve/vidalia_ve.po | 2 +- pkg/win32/po/vi/vidalia_vi.po | 2 +- pkg/win32/po/zh_CN/vidalia_zh_CN.po | 2 +- pkg/win32/po/zh_HK/vidalia_zh_HK.po | 2 +- pkg/win32/po/zu/vidalia_zu.po | 2 +- src/vidalia/help/content/po/af/netview.po | 2 +- src/vidalia/help/content/po/ak/netview.po | 2 +- src/vidalia/help/content/po/am/netview.po | 2 +- src/vidalia/help/content/po/ar/netview.po | 2 +- src/vidalia/help/content/po/arn/netview.po | 2 +- src/vidalia/help/content/po/ast/netview.po | 2 +- src/vidalia/help/content/po/az/netview.po | 2 +- src/vidalia/help/content/po/be/netview.po | 2 +- src/vidalia/help/content/po/bg/netview.po | 2 +- src/vidalia/help/content/po/bn/netview.po | 2 +- src/vidalia/help/content/po/bn_IN/netview.po | 2 +- src/vidalia/help/content/po/ca/netview.po | 2 +- src/vidalia/help/content/po/cs/netview.po | 2 +- src/vidalia/help/content/po/csb/netview.po | 2 +- src/vidalia/help/content/po/dz/netview.po | 2 +- src/vidalia/help/content/po/el/netview.po | 2 +- src/vidalia/help/content/po/eo/netview.po | 2 +- src/vidalia/help/content/po/es/netview.po | 2 +- src/vidalia/help/content/po/et/netview.po | 2 +- src/vidalia/help/content/po/eu/netview.po | 2 +- src/vidalia/help/content/po/fil/netview.po | 2 +- src/vidalia/help/content/po/fr/netview.po | 2 +- src/vidalia/help/content/po/fur/netview.po | 2 +- src/vidalia/help/content/po/ga/netview.po | 2 +- src/vidalia/help/content/po/gl/netview.po | 2 +- src/vidalia/help/content/po/gu/netview.po | 2 +- src/vidalia/help/content/po/gun/netview.po | 2 +- src/vidalia/help/content/po/ha/netview.po | 2 +- src/vidalia/help/content/po/he/netview.po | 2 +- src/vidalia/help/content/po/hi/netview.po | 2 +- src/vidalia/help/content/po/hr/netview.po | 2 +- src/vidalia/help/content/po/ht/netview.po | 2 +- src/vidalia/help/content/po/hu/netview.po | 2 +- src/vidalia/help/content/po/id/netview.po | 2 +- src/vidalia/help/content/po/is/netview.po | 2 +- src/vidalia/help/content/po/it/netview.po | 2 +- src/vidalia/help/content/po/kn/netview.po | 2 +- src/vidalia/help/content/po/kw/netview.po | 2 +- src/vidalia/help/content/po/lb/netview.po | 2 +- src/vidalia/help/content/po/ln/netview.po | 2 +- src/vidalia/help/content/po/lo/netview.po | 2 +- src/vidalia/help/content/po/lt/netview.po | 2 +- src/vidalia/help/content/po/lv/netview.po | 2 +- src/vidalia/help/content/po/mg/netview.po | 2 +- src/vidalia/help/content/po/mi/netview.po | 2 +- src/vidalia/help/content/po/mk/netview.po | 2 +- src/vidalia/help/content/po/ml/netview.po | 2 +- src/vidalia/help/content/po/mn/netview.po | 2 +- src/vidalia/help/content/po/mr/netview.po | 2 +- src/vidalia/help/content/po/ms/netview.po | 2 +- src/vidalia/help/content/po/mt/netview.po | 2 +- src/vidalia/help/content/po/my/netview.po | 2 +- src/vidalia/help/content/po/nap/netview.po | 2 +- src/vidalia/help/content/po/nb/netview.po | 2 +- src/vidalia/help/content/po/ne/netview.po | 2 +- src/vidalia/help/content/po/nl/netview.po | 2 +- src/vidalia/help/content/po/nn/netview.po | 2 +- src/vidalia/help/content/po/nso/netview.po | 2 +- src/vidalia/help/content/po/oc/netview.po | 2 +- src/vidalia/help/content/po/pa/netview.po | 2 +- src/vidalia/help/content/po/pap/netview.po | 2 +- src/vidalia/help/content/po/pl/netview.po | 2 +- src/vidalia/help/content/po/pms/netview.po | 2 +- src/vidalia/help/content/po/ps/netview.po | 2 +- src/vidalia/help/content/po/pt/netview.po | 2 +- src/vidalia/help/content/po/pt_BR/netview.po | 2 +- src/vidalia/help/content/po/ro/netview.po | 2 +- src/vidalia/help/content/po/ru/netview.po | 2 +- src/vidalia/help/content/po/sco/netview.po | 2 +- src/vidalia/help/content/po/son/netview.po | 2 +- src/vidalia/help/content/po/su/netview.po | 2 +- src/vidalia/help/content/po/sw/netview.po | 2 +- src/vidalia/help/content/po/ta/netview.po | 2 +- src/vidalia/help/content/po/te/netview.po | 2 +- src/vidalia/help/content/po/tg/netview.po | 2 +- src/vidalia/help/content/po/th/netview.po | 2 +- src/vidalia/help/content/po/ti/netview.po | 2 +- src/vidalia/help/content/po/tk/netview.po | 2 +- src/vidalia/help/content/po/tr/netview.po | 2 +- src/vidalia/help/content/po/uk/netview.po | 2 +- src/vidalia/help/content/po/ur/netview.po | 2 +- src/vidalia/help/content/po/ve/netview.po | 2 +- src/vidalia/help/content/po/vi/netview.po | 2 +- src/vidalia/help/content/po/wa/netview.po | 2 +- src/vidalia/help/content/po/zh_CN/netview.po | 2 +- src/vidalia/help/content/po/zh_HK/netview.po | 2 +- src/vidalia/help/content/po/zh_TW/netview.po | 2 +- src/vidalia/help/content/po/zu/netview.po | 2 +- src/vidalia/i18n/po/af/vidalia_af.po | 2 +- src/vidalia/i18n/po/ak/vidalia_ak.po | 2 +- src/vidalia/i18n/po/am/vidalia_am.po | 2 +- src/vidalia/i18n/po/ar/vidalia_ar.po | 4 +- src/vidalia/i18n/po/arn/vidalia_arn.po | 2 +- src/vidalia/i18n/po/ast/vidalia_ast.po | 2 +- src/vidalia/i18n/po/az/vidalia_az.po | 2 +- src/vidalia/i18n/po/bg/vidalia_bg.po | 2 +- src/vidalia/i18n/po/bn_IN/vidalia_bn_IN.po | 2 +- src/vidalia/i18n/po/ca/vidalia_ca.po | 2 +- src/vidalia/i18n/po/cs/vidalia_cs.po | 4 +- src/vidalia/i18n/po/csb/vidalia_csb.po | 2 +- src/vidalia/i18n/po/cy/vidalia_cy.po | 2 +- src/vidalia/i18n/po/de/vidalia_de.po | 6 +- src/vidalia/i18n/po/de_CH/vidalia_de_CH.po | 2 +- src/vidalia/i18n/po/dz/vidalia_dz.po | 2 +- src/vidalia/i18n/po/el/vidalia_el.po | 29 +- src/vidalia/i18n/po/eo/vidalia_eo.po | 4 +- src/vidalia/i18n/po/es/vidalia_es.po | 111 ++- src/vidalia/i18n/po/et/vidalia_et.po | 2 +- src/vidalia/i18n/po/eu/vidalia_eu.po | 2 +- src/vidalia/i18n/po/fil/vidalia_fil.po | 2 +- src/vidalia/i18n/po/fur/vidalia_fur.po | 2 +- src/vidalia/i18n/po/ga/vidalia_ga.po | 2 +- src/vidalia/i18n/po/gl/vidalia_gl.po | 2 +- src/vidalia/i18n/po/gu/vidalia_gu.po | 2 +- src/vidalia/i18n/po/gun/vidalia_gun.po | 2 +- src/vidalia/i18n/po/ha/vidalia_ha.po | 2 +- src/vidalia/i18n/po/he/vidalia_he.po | 4 +- src/vidalia/i18n/po/hi/vidalia_hi.po | 2 +- src/vidalia/i18n/po/hr/vidalia_hr.po | 2 +- src/vidalia/i18n/po/ht/vidalia_ht.po | 2 +- src/vidalia/i18n/po/hu/vidalia_hu.po | 1051 ++++++++++--------- src/vidalia/i18n/po/id/vidalia_id.po | 1459 ++++++++++++++----------- src/vidalia/i18n/po/is/vidalia_is.po | 2 +- src/vidalia/i18n/po/it/vidalia_it.po | 4 +- src/vidalia/i18n/po/kn/vidalia_kn.po | 2 +- src/vidalia/i18n/po/lb/vidalia_lb.po | 2 +- src/vidalia/i18n/po/ln/vidalia_ln.po | 2 +- src/vidalia/i18n/po/lo/vidalia_lo.po | 2 +- src/vidalia/i18n/po/lt/vidalia_lt.po | 2 +- src/vidalia/i18n/po/lv/vidalia_lv.po | 2 +- src/vidalia/i18n/po/mg/vidalia_mg.po | 2 +- src/vidalia/i18n/po/mi/vidalia_mi.po | 2 +- src/vidalia/i18n/po/mk/vidalia_mk.po | 2 +- src/vidalia/i18n/po/ml/vidalia_ml.po | 2 +- src/vidalia/i18n/po/mn/vidalia_mn.po | 2 +- src/vidalia/i18n/po/mr/vidalia_mr.po | 2 +- src/vidalia/i18n/po/ms/vidalia_ms.po | 2 +- src/vidalia/i18n/po/mt/vidalia_mt.po | 2 +- src/vidalia/i18n/po/my/vidalia_my.po | 4 +- src/vidalia/i18n/po/nah/vidalia_nah.po | 2 +- src/vidalia/i18n/po/nap/vidalia_nap.po | 2 +- src/vidalia/i18n/po/nb/vidalia_nb.po | 4 +- src/vidalia/i18n/po/ne/vidalia_ne.po | 2 +- src/vidalia/i18n/po/nl/vidalia_nl.po | 489 ++++++--- src/vidalia/i18n/po/nn/vidalia_nn.po | 2 +- src/vidalia/i18n/po/nso/vidalia_nso.po | 2 +- src/vidalia/i18n/po/oc/vidalia_oc.po | 2 +- src/vidalia/i18n/po/pa/vidalia_pa.po | 2 +- src/vidalia/i18n/po/pap/vidalia_pap.po | 2 +- src/vidalia/i18n/po/pl/vidalia_pl.po | 4 +- src/vidalia/i18n/po/pms/vidalia_pms.po | 2 +- src/vidalia/i18n/po/ps/vidalia_ps.po | 2 +- src/vidalia/i18n/po/pt/vidalia_pt.po | 4 +- src/vidalia/i18n/po/pt_BR/vidalia_pt_BR.po | 4 +- src/vidalia/i18n/po/ru/vidalia_ru.po | 2 +- src/vidalia/i18n/po/sco/vidalia_sco.po | 2 +- src/vidalia/i18n/po/son/vidalia_son.po | 2 +- src/vidalia/i18n/po/su/vidalia_su.po | 2 +- src/vidalia/i18n/po/sw/vidalia_sw.po | 2 +- src/vidalia/i18n/po/ta/vidalia_ta.po | 2 +- src/vidalia/i18n/po/te/vidalia_te.po | 2 +- src/vidalia/i18n/po/tg/vidalia_tg.po | 2 +- src/vidalia/i18n/po/th/vidalia_th.po | 4 +- src/vidalia/i18n/po/ti/vidalia_ti.po | 2 +- src/vidalia/i18n/po/tk/vidalia_tk.po | 2 +- src/vidalia/i18n/po/tr/vidalia_tr.po | 4 +- src/vidalia/i18n/po/ur/vidalia_ur.po | 2 +- src/vidalia/i18n/po/ve/vidalia_ve.po | 2 +- src/vidalia/i18n/po/vi/vidalia_vi.po | 4 +- src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po | 4 +- src/vidalia/i18n/po/zh_HK/vidalia_zh_HK.po | 2 +- src/vidalia/i18n/po/zu/vidalia_zu.po | 2 +- 253 files changed, 2041 insertions(+), 1626 deletions(-)

1 0

[vidalia/master] Log the used ports when auto is on
by chiiph＠torproject.org 12 Aug '11

12 Aug '11

commit 8e0ca7188a91091d5ef6c75ed480f99cab2bf397 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Wed Aug 10 10:01:27 2011 -0300 Log the used ports when auto is on --- src/vidalia/MainWindow.cpp | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 5634e63..c878fd1 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -2030,6 +2030,13 @@ MainWindow::updateBrowserEnv() { env << QString("TOR_SOCKS_HOST=%1").arg(addr.toString()); env << QString("TOR_SOCKS_PORT=%1").arg(port); + + vInfo(QString("Using automatic ControlPort and SocksPort configuration:\n" + " ControlPort=%1\n SocksPort=%2\n Host=%3\n Configuration file:%4") + .arg(_autoControlPort) + .arg(port) + .arg(addrPort.at(0)) + .arg(QString("%1/port.conf").arg(expand_filename(settings.getDataDirectory())))); } if(settings.getAuthenticationMethod() == TorSettings::PasswordAuth) {

1 0

[vidalia/master] Update the CHANGELOG
by chiiph＠torproject.org 12 Aug '11

12 Aug '11

commit be1e68836ea5a45c070a77bed6d5ddc564197770 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Wed Aug 10 10:17:38 2011 -0300 Update the CHANGELOG --- CHANGELOG | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9a3d8d4..1b059cf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -0.2.13 11-Jun-2011 +0.2.13 10-Aug-2011 o Add a way to bootstrap Tor's torrc file (copy the torrc to a given directory before Vidalia starts) so that packages such as Bridge-by-default portable bundles for OSX don't violate the directory @@ -22,8 +22,17 @@ o Make the fact that bridges don't need a DirPort setting more clear by removing the content of the field when disabling it. Fixes bug 3119. o Improve command line parameter handling. Resolves bug 2965. - o Fix layout in BandwidthGraph to display correctly everything with every + o Fix layout in BandwidthGraph to display labels correctly in every language. Fixes bug 2500. + o Updates README.debs to reflect the change in the packaging now that + Vidalia uses Git. Fixes bug 3668. + o Add a way to use the autoconfiguration for ControlPort and SocksPort. + Tor can now autoconfigure Control and Socks Ports when the default ones + are in use. This makes it easier to run several different instances of + TBB at the same time. Resolves bug 3077. + o Provide the necessary fields (Control password, ControlPort) to let + TorButton NEWNYM. Vidalia provides these in env vars when it launches + the Firefox instance. Resolves bug 2659. 0.2.12 10-Apr-2011 o Vidalia's SVN repository has been migrated to Git. All branches but

1 0

[vidalia/master] TorButton needs the plaintext password, not the hashed one
by chiiph＠torproject.org 12 Aug '11

12 Aug '11

commit a815ce4f00a066d8d4b37b2a557dc7c415c77707 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Wed Aug 10 13:13:10 2011 -0300 TorButton needs the plaintext password, not the hashed one --- 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 c878fd1..4e697f6 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(TorSettings::hashPassword(settings.getControlPassword())); + env << QString("TOR_CONTROL_PASSWD=%1").arg(settings.getControlPassword()); env << QString("TOR_CONTROL_PORT=%1").arg(_autoControlPort); }

1 0

[vidalia/master] Use the random password if set
by chiiph＠torproject.org 12 Aug '11

12 Aug '11

commit b06ec8f30f16c59e4e0cb93e18636dbd811a668e Author: Tomas Touceda <chiiph(a)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); }

1 0

[vidalia/master] Escape the password, just in case
by chiiph＠torproject.org 12 Aug '11

12 Aug '11

commit 4cca4038cddb421ab05554dd016629dc1c066dcc Author: Tomas Touceda <chiiph(a)torproject.org> Date: Wed Aug 10 13:22:25 2011 -0300 Escape the password, just in case --- 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 4e697f6..5120fde 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(settings.getControlPassword()); + env << QString("TOR_CONTROL_PASSWD=%1").arg(string_escape(settings.getControlPassword())); env << QString("TOR_CONTROL_PORT=%1").arg(_autoControlPort); }

1 0

[vidalia/master] And remove the quotes
by chiiph＠torproject.org 12 Aug '11

12 Aug '11

commit 7e3afb64d6dc30f5ad9a11289a6bd92d037c2082 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Wed Aug 10 15:22:09 2011 -0300 And remove the quotes --- 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 37a8752..4b2bf14 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(_controlPassword.toAscii().toHex()))); + env << QString("TOR_CONTROL_PASSWD=%1").arg(QString(_controlPassword.toAscii().toHex())); env << QString("TOR_CONTROL_PORT=%1").arg(_autoControlPort); }

1 0

[vidalia/master] Hex encode the password string to avoind random breaks
by chiiph＠torproject.org 12 Aug '11

12 Aug '11

commit 91252576a424317e7719ebb7280d593a27013e79 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Wed Aug 10 14:40:08 2011 -0300 Hex encode the password string to avoind random breaks --- 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 5120fde..b5a8434 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(settings.getControlPassword())); + env << QString("TOR_CONTROL_PASSWD=%1").arg(string_escape(QString(settings.getControlPassword().toAscii().toHex()))); env << QString("TOR_CONTROL_PORT=%1").arg(_autoControlPort); }

1 0

[vidalia/master] Prevent hanging at start because of timing problem
by chiiph＠torproject.org 12 Aug '11

12 Aug '11

commit d98686dd808a4760fe302cbc883713effdcdb8ea Author: Tomas Touceda <chiiph(a)torproject.org> Date: Fri Aug 12 20:44:11 2011 -0300 Prevent hanging at start because of timing problem Tor takes a bit to create the port.conf file and Vidalia hangs without warning when it can't read it. The idea is to try 5 times waiting 1 second, or fail explaining the reason. 5 seconds should be enough in most systems. --- src/vidalia/MainWindow.cpp | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index b1aff22..9ef9656 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1142,8 +1142,20 @@ MainWindow::started() if(settings.autoControlPort()) { QString dataDirectory = settings.getDataDirectory(); QFile file(QString("%1/port.conf").arg(expand_filename(dataDirectory))); - if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) + int tries = 0, maxtries = 5; + while((!file.open(QIODevice::ReadOnly | QIODevice::Text)) and + (tries++ < maxtries)) { + vWarn(QString("This is try number: %1.").arg(tries)); + sleep(1); + } + + if(tries >= maxtries) { + vWarn("Couldn't read port.conf file"); + connectFailed(QString("Vidalia can't find out how to talk to Tor because it can't access this file: %1\n\nHere's the last error message:\n %2") + .arg(file.fileName()) + .arg(file.errorString())); return; + } QTextStream in(&file); if(!in.atEnd()) { @@ -1159,6 +1171,8 @@ MainWindow::started() _autoControlPort = addrPort.at(1).toInt(); _torControl->connect(addr, _autoControlPort); } + + file.close(); } else { /* Try to connect to Tor's control port */ if(settings.getControlMethod() == ControlMethod::Port) {

1 0

[vidalia/master] Make the sleep work on Windows
by chiiph＠torproject.org 12 Aug '11

12 Aug '11

commit 82647664696b42205a6c196b6502d87bd8ee4629 Author: Tomas Touceda <chiiph(a)torproject.org> Date: Fri Aug 12 23:21:25 2011 -0300 Make the sleep work on Windows --- src/vidalia/MainWindow.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 9ef9656..b159d2e 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1146,7 +1146,11 @@ MainWindow::started() while((!file.open(QIODevice::ReadOnly | QIODevice::Text)) and (tries++ < maxtries)) { vWarn(QString("This is try number: %1.").arg(tries)); +#if defined(Q_WS_WIN) + Sleep(1000); +#else sleep(1); +#endif } if(tries >= maxtries) {

1 0