- tor-commits - lists.torproject.org

[vidalia/master] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 58465f9b1b08bc835422e8d9129a73a0a54eb676 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:49:20 2012 -0300 Add a changes file --- changes/bug4598 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4598 b/changes/bug4598 new file mode 100644 index 0000000..89daf1d --- /dev/null +++ b/changes/bug4598 @@ -0,0 +1,2 @@ + o Explicitly disable SocksPort auto by setting it to its default + (9050). Fixes bug 4598. \ No newline at end of file

1 0

[vidalia/master] Explicitly disable SocksPort auto
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 184f638815a00101be86eaa2c5f62d27d8eff62f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 20:56:45 2012 -0300 Explicitly disable SocksPort auto --- src/vidalia/config/TorSettings.cpp | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/vidalia/config/TorSettings.cpp b/src/vidalia/config/TorSettings.cpp index d45d88e..3070c09 100644 --- a/src/vidalia/config/TorSettings.cpp +++ b/src/vidalia/config/TorSettings.cpp @@ -59,6 +59,7 @@ #define TOR_ARG_DATA_DIRECTORY "DataDirectory" #define TOR_ARG_HASHED_PASSWORD "HashedControlPassword" #define TOR_ARG_COOKIE_AUTH "CookieAuthentication" +#define TOR_ARG_SOCKSPORT "SocksPort" /** Generate random control passwords of 16 characters */ #define PASSWORD_LEN 16 @@ -105,6 +106,11 @@ TorSettings::apply(QString *errmsg) conf.insert(SETTING_CONTROL_PORT, localValue(SETTING_CONTROL_PORT).toString()); + + if(localValue(SETTING_AUTOCONTROL).toBool()) + conf.insert(TOR_ARG_SOCKSPORT, "auto"); + else + conf.insert(TOR_ARG_SOCKSPORT, "9050"); AuthenticationMethod authMethod = toAuthenticationMethod(localValue(SETTING_AUTH_METHOD).toString());

1 0

[vidalia/master] Add a SkipVersionCheck config option for Tails
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit c21a76e6745312566c6a2775cfff0c8b728c024e Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 14:57:30 2012 -0300 Add a SkipVersionCheck config option for Tails --- src/vidalia/MainWindow.cpp | 3 +++ src/vidalia/config/VidaliaSettings.cpp | 8 ++++++++ src/vidalia/config/VidaliaSettings.h | 3 +++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index a60509f..c9dbd60 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1655,6 +1655,9 @@ MainWindow::circuitEstablished() void MainWindow::checkTorVersion() { + VidaliaSettings settings; + if(settings.skipVersionCheck()) + return; QString status; if (_torControl->getInfo("status/version/current", status)) { if (!status.compare("old", Qt::CaseInsensitive) diff --git a/src/vidalia/config/VidaliaSettings.cpp b/src/vidalia/config/VidaliaSettings.cpp index 6cf3238..7273f10 100644 --- a/src/vidalia/config/VidaliaSettings.cpp +++ b/src/vidalia/config/VidaliaSettings.cpp @@ -39,6 +39,7 @@ #define SETTING_LAST_UPDATE_CHECK "LastUpdateCheck" #define SETTING_USE_LOCAL_GEOIP_DATABASE "UseLocalGeoIpDatabase" #define SETTING_LOCAL_GEOIP_DATABASE "LocalGeoIpDatabase" +#define SETTING_SKIP_VERSION_CHECK "SkipVersionCheck" #if defined(Q_OS_WIN32) #define STARTUP_REG_KEY "Software\\Microsoft\\Windows\\CurrentVersion\\Run" @@ -84,6 +85,7 @@ VidaliaSettings::VidaliaSettings() setDefault(SETTING_USE_LOCAL_GEOIP_DATABASE, false); setDefault(SETTING_LOCAL_GEOIP_DATABASE, ""); setDefault(SETTING_ICON_PREF, Both); + setDefault(SETTING_SKIP_VERSION_CHECK, false); } /** Gets the currently preferred language code for Vidalia. */ @@ -355,3 +357,9 @@ VidaliaSettings::fromString(QString iconPref) return Both; } + +bool +VidaliaSettings::skipVersionCheck() const +{ + return value(SETTING_SKIP_VERSION_CHECK).toBool(); +} diff --git a/src/vidalia/config/VidaliaSettings.h b/src/vidalia/config/VidaliaSettings.h index 6cbdefb..b378d9b 100644 --- a/src/vidalia/config/VidaliaSettings.h +++ b/src/vidalia/config/VidaliaSettings.h @@ -139,6 +139,9 @@ public: void setIconPref(const IconPosition iconPref); QString toString(const IconPosition iconPref); IconPosition fromString(QString iconPref); + + /** Returns true if Vidalia should skip the version check for tor */ + bool skipVersionCheck() const; }; #endif

1 0

[vidalia/master] Remove HttpProxy setting
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit b4017ad68152a13ea9bdcfb6a35636bf0f6e472a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 19:34:56 2012 -0300 Remove HttpProxy setting --- src/vidalia/config/NetworkPage.cpp | 1 - src/vidalia/config/NetworkSettings.cpp | 12 ------------ src/vidalia/config/NetworkSettings.h | 5 ++--- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp index b40cbdd..8bfabb3 100644 --- a/src/vidalia/config/NetworkPage.cpp +++ b/src/vidalia/config/NetworkPage.cpp @@ -310,7 +310,6 @@ NetworkPage::load() proxyType = NetworkSettings::NoProxy; ui.chkUseProxy->setChecked(false); } - ui.cmboProxyType->addItem(tr("HTTP"), NetworkSettings::HttpProxy); ui.cmboProxyType->addItem(tr("HTTP / HTTPS"), NetworkSettings::HttpHttpsProxy); diff --git a/src/vidalia/config/NetworkSettings.cpp b/src/vidalia/config/NetworkSettings.cpp index de818f4..0229442 100644 --- a/src/vidalia/config/NetworkSettings.cpp +++ b/src/vidalia/config/NetworkSettings.cpp @@ -26,8 +26,6 @@ #define SETTING_PROXY_PASSWORD "ProxyPassword" /* Tor's proxy options */ -#define SETTING_HTTP_PROXY "HttpProxy" -#define SETTING_HTTP_PROXY_AUTH "HttpProxyAuthenticator" #define SETTING_HTTPS_PROXY "HttpsProxy" #define SETTING_HTTPS_PROXY_AUTH "HttpsProxyAuthenticator" #define SETTING_SOCKS4_PROXY "Socks4Proxy" @@ -90,9 +88,6 @@ NetworkSettings::apply(QString *errmsg) case Socks5Proxy: socks5 = addr; break; - case HttpProxy: - http = addr; - break; case HttpHttpsProxy: http = addr; https = http; @@ -107,9 +102,7 @@ NetworkSettings::apply(QString *errmsg) conf.insert(SETTING_SOCKS5_PASSWORD, pass); } - conf.insert(SETTING_HTTP_PROXY, http); conf.insert(SETTING_HTTPS_PROXY, https); - conf.insert(SETTING_HTTP_PROXY_AUTH, auth); conf.insert(SETTING_HTTPS_PROXY_AUTH, auth); if (getUseBridges()) { @@ -305,9 +298,6 @@ NetworkSettings::proxyTypeToString(ProxyType type) case Socks5Proxy: ret = "socks5"; break; - case HttpProxy: - ret = "http"; - break; case HttpHttpsProxy: ret = "httphttps"; break; @@ -330,8 +320,6 @@ NetworkSettings::proxyTypeFromString(const QString &type) return Socks4Proxy; if (str == "socks5") return Socks5Proxy; - if (str == "http") - return HttpProxy; if (str == "httphttps") return HttpHttpsProxy; diff --git a/src/vidalia/config/NetworkSettings.h b/src/vidalia/config/NetworkSettings.h index fe555e3..aa5d88a 100644 --- a/src/vidalia/config/NetworkSettings.h +++ b/src/vidalia/config/NetworkSettings.h @@ -33,9 +33,8 @@ public: NoProxy = -1, /**< Have Tor connect directly to the Internet. */ Socks4Proxy = 0, /**< Use a SOCKS 4 proxy for OR connections. */ Socks5Proxy = 1, /**< Use a SOCKS 5 proxy for OR connections. */ - HttpProxy = 2, /**< Use an HTTP proxy for non-tunneled dir fetches. */ - HttpHttpsProxy = 3, /**< Use HTTP proxy for both dir and OR connections. */ - ProxyTypeMax = 3 + HttpHttpsProxy = 2, /**< Use HTTP proxy for both dir and OR connections. */ + ProxyTypeMax = 2 }; public:

1 0

[vidalia/master] Try removing the port.conf file before using auto as *Port
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 098b460546307baced227daa7ea042d7297503a8 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 20:02:22 2012 -0300 Try removing the port.conf file before using auto as *Port --- src/vidalia/MainWindow.cpp | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index a60509f..8e00123 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1069,9 +1069,13 @@ MainWindow::start() if(settings.getControlMethod() == ControlMethod::Port) { if(settings.autoControlPort()) { + QString portconf = QString("%1/port.conf").arg(expDataDirectory); + if(!QFile::remove(portconf)) + vWarn(QString("Unable to remove %s, may be it didn't existed.").arg(portconf)); + args << "ControlPort" << "auto"; args << "SocksPort" << "auto"; - args << "ControlPortWriteToFile" << QString("%1/port.conf").arg(expDataDirectory); + args << "ControlPortWriteToFile" << portconf; } else { /* Add the intended control port value */ quint16 controlPort = settings.getControlPort();

1 0

[vidalia/master] Merge branch 'bug4656_squeeze_backport'
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit f329a00c9694e3331817b2705301a5e836df7981 Merge: 7955f0c 0ddabf4 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 13:15:00 2012 -0300 Merge branch 'bug4656_squeeze_backport' changes/bug4656 | 2 ++ src/vidalia/config/ServerPage.ui | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[vidalia/master] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 0ddabf4839f22b7f998e277eece70ffd70877b05 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:15:01 2012 -0300 Add a changes file --- changes/bug4656 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4656 b/changes/bug4656 new file mode 100644 index 0000000..d958b92 --- /dev/null +++ b/changes/bug4656 @@ -0,0 +1,2 @@ + o Sets the preferred size for the GUI layout so it doesn't squeeze + widges when the size isn't big enough. Fixes bug 4656. \ No newline at end of file

1 0

[vidalia/master] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 7955f0c79e31f2ca63dba8cee81e7f30ea3aecdc Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:05:20 2012 -0300 Add a changes file --- changes/bug3463 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug3463 b/changes/bug3463 new file mode 100644 index 0000000..3e23e08 --- /dev/null +++ b/changes/bug3463 @@ -0,0 +1,3 @@ + o Uses TAKEOWNERSHIP and __OwningControllerProcess to avoid leaving + tor running in background if Vidalia exits unexpectedly. Fixes bug + 3463. \ No newline at end of file

1 0

[vidalia/master] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 1feaf55b43c958332b05a68919a067a9a8075ebf Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:18:32 2012 -0300 Add a changes file --- changes/bug4736 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug4736 b/changes/bug4736 new file mode 100644 index 0000000..4b517d3 --- /dev/null +++ b/changes/bug4736 @@ -0,0 +1,3 @@ + o Add a hidden configuration option called SkipVersionCheck so + systems like Tails can force Vidalia to skip checking tor's + version. Resolves ticket 4736. \ No newline at end of file

1 0

[vidalia/master] Merge branch 'bug4736_donotwarn_backport'
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit c1e7f608b5a6a281a444f60776d911457b46c497 Merge: f329a00 1feaf55 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 13:16:24 2012 -0300 Merge branch 'bug4736_donotwarn_backport' changes/bug4736 | 3 +++ src/vidalia/MainWindow.cpp | 3 +++ src/vidalia/config/VidaliaSettings.cpp | 8 ++++++++ src/vidalia/config/VidaliaSettings.h | 3 +++ 4 files changed, 17 insertions(+), 0 deletions(-)

1 0