- tor-commits - lists.torproject.org

[tor/master] bump to 0.2.3.3-alpha-dev
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit 7ca16affb5722561a5d50b1820328d1833a9099e Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:41:55 2011 -0400 bump to 0.2.3.3-alpha-dev --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index deac774..f3640cb 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.3-alpha) +AM_INIT_AUTOMAKE(tor, 0.2.3.3-alpha-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 0f022e4..137cb67 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.3-alpha" +!define VERSION "0.2.3.3-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index fb1ad90..aed3002 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -234,7 +234,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.3-alpha" +#define VERSION "0.2.3.3-alpha-dev"

1 0

[tor/master] merge in one more
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit 01357d6b163b1823811435871c92d6972b4eb65d Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:24:25 2011 -0400 merge in one more --- ChangeLog | 5 +++++ changes/bug3898a | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7084a0f..1e0f850 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,11 @@ Changes in version 0.2.3.3-alpha - 2011-09-01 non-errors. Fixes bug 3700; bugfix on 0.2.3.1-alpha. o Minor bugfixes (on 2.2.x and earlier): + - Correct the man page to explain that HashedControlPassword and + CookieAuthentication can both be set, in which case either method + is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, + when we decided to allow these config options to both be set. Issue + raised by bug 3898. - The "--quiet" and "--hush" options now apply not only to Tor's behavior before logs are configured, but also to Tor's behavior in the absense of configured logs. Fixes bug 3550; bugfix on diff --git a/changes/bug3898a b/changes/bug3898a deleted file mode 100644 index d40445e..0000000 --- a/changes/bug3898a +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Correct the man page to explain that HashedControlPassword and - CookieAuthentication can both be set, in which case either method - is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, - when we decided to allow these config options to both be set. Issue - raised by bug 3898.

1 0

[tor/master] Correct man page: multiple control auth styles can be set at once
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit e0dae64449958f4c80e6da1ee6a336a60ffc21d5 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:01:55 2011 -0400 Correct man page: multiple control auth styles can be set at once --- changes/bug3898a | 6 ++++++ doc/tor.1.txt | 17 +++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/changes/bug3898a b/changes/bug3898a new file mode 100644 index 0000000..d40445e --- /dev/null +++ b/changes/bug3898a @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Correct the man page to explain that HashedControlPassword and + CookieAuthentication can both be set, in which case either method + is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, + when we decided to allow these config options to both be set. Issue + raised by bug 3898. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index bfc9766..823a6f5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -148,10 +148,11 @@ Other options can be specified either on the command-line (--option **ControlPort** __PORT__|**auto**:: If set, Tor will accept connections on this port and allow those connections to control the Tor process using the Tor Control Protocol - (described in control-spec.txt). Note: unless you also specify one of - **HashedControlPassword** or **CookieAuthentication**, setting this - option will - cause Tor to allow any process on the local host to control it. This + (described in control-spec.txt). Note: unless you also specify one or + more of **HashedControlPassword** or **CookieAuthentication**, + setting this option will cause Tor to allow any process on the local + host to control it. (Setting both authentication methods means either + method is sufficient to authenticate to Tor.) This option is required for many Tor controllers; most use the value of 9051. Set it to "auto" to have Tor pick a port for you. (Default: 0). @@ -173,15 +174,15 @@ Other options can be specified either on the command-line (--option the control socket readable and writable by the default GID. (Default: 0) **HashedControlPassword** __hashed_password__:: - Don't allow any connections on the control port except when the other - process knows the password whose one-way hash is __hashed_password__. You + Allow connections on the control port if they present + the password whose one-way hash is __hashed_password__. You can compute the hash of a password by running "tor --hash-password __password__". You can provide several acceptable passwords by using more than one HashedControlPassword line. **CookieAuthentication** **0**|**1**:: - If this option is set to 1, don't allow any connections on the control port - except when the connecting process knows the contents of a file named + If this option is set to 1, allow connections on the control port + when the connecting process knows the contents of a file named "control_auth_cookie", which Tor will create in its data directory. This authentication method should only be used on systems with good filesystem security. (Default: 0)

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit fe0fa91164bf1f8f305fc048b472fb6445551533 Merge: f68cd4a e0dae64 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:23:37 2011 -0400 Merge branch 'maint-0.2.2' changes/bug3898a | 6 ++++++ doc/tor.1.txt | 17 +++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.2] Correct man page: multiple control auth styles can be set at once
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit e0dae64449958f4c80e6da1ee6a336a60ffc21d5 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 07:01:55 2011 -0400 Correct man page: multiple control auth styles can be set at once --- changes/bug3898a | 6 ++++++ doc/tor.1.txt | 17 +++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/changes/bug3898a b/changes/bug3898a new file mode 100644 index 0000000..d40445e --- /dev/null +++ b/changes/bug3898a @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Correct the man page to explain that HashedControlPassword and + CookieAuthentication can both be set, in which case either method + is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, + when we decided to allow these config options to both be set. Issue + raised by bug 3898. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index bfc9766..823a6f5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -148,10 +148,11 @@ Other options can be specified either on the command-line (--option **ControlPort** __PORT__|**auto**:: If set, Tor will accept connections on this port and allow those connections to control the Tor process using the Tor Control Protocol - (described in control-spec.txt). Note: unless you also specify one of - **HashedControlPassword** or **CookieAuthentication**, setting this - option will - cause Tor to allow any process on the local host to control it. This + (described in control-spec.txt). Note: unless you also specify one or + more of **HashedControlPassword** or **CookieAuthentication**, + setting this option will cause Tor to allow any process on the local + host to control it. (Setting both authentication methods means either + method is sufficient to authenticate to Tor.) This option is required for many Tor controllers; most use the value of 9051. Set it to "auto" to have Tor pick a port for you. (Default: 0). @@ -173,15 +174,15 @@ Other options can be specified either on the command-line (--option the control socket readable and writable by the default GID. (Default: 0) **HashedControlPassword** __hashed_password__:: - Don't allow any connections on the control port except when the other - process knows the password whose one-way hash is __hashed_password__. You + Allow connections on the control port if they present + the password whose one-way hash is __hashed_password__. You can compute the hash of a password by running "tor --hash-password __password__". You can provide several acceptable passwords by using more than one HashedControlPassword line. **CookieAuthentication** **0**|**1**:: - If this option is set to 1, don't allow any connections on the control port - except when the connecting process knows the contents of a file named + If this option is set to 1, allow connections on the control port + when the connecting process knows the contents of a file named "control_auth_cookie", which Tor will create in its data directory. This authentication method should only be used on systems with good filesystem security. (Default: 0)

1 0

r25004: {website} weasel is now using C82E0039 instead of 94C09C7F (in website/trunk/docs: en pl)
by Peter Palfrader 02 Sep '11

02 Sep '11

Author: weasel Date: 2011-09-02 11:15:48 +0000 (Fri, 02 Sep 2011) New Revision: 25004 Modified: website/trunk/docs/en/verifying-signatures.wml website/trunk/docs/pl/verifying-signatures.wml Log: weasel is now using C82E0039 instead of 94C09C7F Modified: website/trunk/docs/en/verifying-signatures.wml =================================================================== --- website/trunk/docs/en/verifying-signatures.wml 2011-09-01 02:58:55 UTC (rev 25003) +++ website/trunk/docs/en/verifying-signatures.wml 2011-09-02 11:15:48 UTC (rev 25004) @@ -26,7 +26,7 @@ <li>Roger's (0x28988BF5) typically signs the source code file.</li> <li>Nick's (0x165733EA, or its subkey 0x8D29319A).</li> <li>Andrew's (0x31B0974B) typically signed older packages for windows and mac.</li> - <li>Peter's (0x94C09C7F, or its subkey 0xAFA44BDD).</li> + <li>Peter's (0xC82E0039, or its subkey 0xE1DEC577).</li> <li>Tomás's (0x9A753A6B) signs current Vidalia release tarballs and tags.</li> <li>Matt's (0x5FA14861) signed older Vidalia release tarballs.</li> <li>Damian's (0x9ABBEEC6) signs Arm releases</li> @@ -112,8 +112,8 @@ uid Andrew Lewman <andrew(a)torproject.org> sub 4096g/B77F95F7 2003-07-17 - pub 1024D/94C09C7F 1999-11-10 - Key fingerprint = 5B00 C96D 5D54 AEE1 206B AF84 DE7A AF6E 94C0 9C7F + pub 4096R/C82E0039 2003-03-24 + Key fingerprint = 25FC 1614 B8F8 7B52 FF2F 99B9 62AF 4031 C82E 0039 uid Peter Palfrader uid Peter Palfrader <peter(a)palfrader.org> uid Peter Palfrader <weasel(a)debian.org> Modified: website/trunk/docs/pl/verifying-signatures.wml =================================================================== --- website/trunk/docs/pl/verifying-signatures.wml 2011-09-01 02:58:55 UTC (rev 25003) +++ website/trunk/docs/pl/verifying-signatures.wml 2011-09-02 11:15:48 UTC (rev 25004) @@ -31,7 +31,7 @@ <li>Rogera (0x28988BF5) zazwyczaj podpisuje plik z kodem źródłowym.</li> <li>Nicka (0x165733EA, lub jego podklucz 0x8D29319A).</li> <li>Andrzeja (0x31B0974B) zazwyczaj podpisuje paczki dla windows i mac.</li> - <li>Petera (0x94C09C7F, lub jego podklucz 0xAFA44BDD).</li> + <li>Petera (0xC82E0039, lub jego podklucz 0xE1DEC577).</li> <li>Tomása (0x9A753A6B) podpisuje aktualne wersje Vidalii i tagi.</li> <li>Matta (0x5FA14861) podpisyał starsze wersje Vidalii.</li> <li>Damiana (0x9ABBEEC6) podpisuje wydania Arma</li> @@ -123,8 +123,8 @@ uid Andrew Lewman <andrew(a)torproject.org> sub 4096g/B77F95F7 2003-07-17 - pub 1024D/94C09C7F 1999-11-10 - Key fingerprint = 5B00 C96D 5D54 AEE1 206B AF84 DE7A AF6E 94C0 9C7F + pub 4096R/C82E0039 2003-03-24 + Key fingerprint = 25FC 1614 B8F8 7B52 FF2F 99B9 62AF 4031 C82E 0039 uid Peter Palfrader uid Peter Palfrader <peter(a)palfrader.org> uid Peter Palfrader <weasel(a)debian.org>

1 0

[tor/master] bump to 0.2.3.3-alpha
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit f68cd4a175b696d61bf9473466e871c6075b01fe Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 2 06:23:28 2011 -0400 bump to 0.2.3.3-alpha --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 26792a6..deac774 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.2-alpha-dev) +AM_INIT_AUTOMAKE(tor, 0.2.3.3-alpha) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 1dfa2e9..0f022e4 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.2-alpha-dev" +!define VERSION "0.2.3.3-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index cf49339..fb1ad90 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -234,7 +234,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.2-alpha-dev" +#define VERSION "0.2.3.3-alpha"

1 0

[torbutton/master] Bug #3337: Fetch check.tp.o update page if needed
by mikeperry＠torproject.org 02 Sep '11

02 Sep '11

commit ed87e0e58d49a5b5a0e0f96e47dd559074678aad Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Sep 1 22:11:16 2011 -0700 Bug #3337: Fetch check.tp.o update page if needed Uses https://check.torproject.org/RecommendedTBBVersions as the version list. If this url is 404, the feature is disabled. Otherwise, we check to see if the current value of torbrowser.version is present in the returned JSON list. If so, we fetch the normal check homepage. Otherwise, we fetch the upgrade notice. --- src/chrome/content/torbutton.js | 65 ++++++++++++++++++++++++++++++- src/defaults/preferences/preferences.js | 2 + 2 files changed, 66 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 6496895..5378467 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -861,6 +861,53 @@ function torbutton_restore_nontor_settings() torbutton_log(2, 'settings restored'); } +function torbutton_check_version() { + torbutton_log(3, "Checking version"); + try { + var req = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] + .createInstance(Components.interfaces.nsIXMLHttpRequest); + //var req = new XMLHttpRequest(); Blocked by content policy + var url = m_tb_prefs.getCharPref("extensions.torbutton.versioncheck_url"); + req.open('GET', url, false); + req.overrideMimeType("text/json"); + req.send(null); + } catch(e) { + if(e.result == 0x80004005) { // NS_ERROR_FAILURE + torbutton_log(5, "Version check failed! Is tor running?"); + return -1; + } + torbutton_log(5, "Version check failed! Tor internal error: "+e); + return -1; + } + if(req.status == 200) { + if(!req.responseText) { + torbutton_log(5, "Version check failed! No JSON present!"); + return -1; + } + try { + var version_list = JSON.parse(req.responseText); + // torbrowser.version may not exist.. + var my_version = m_tb_prefs.getCharPref("torbrowser.version"); + for (var v in version_list) { + if (version_list[v] == my_version) { + return 1; + } + } + return 0; + } catch(e) { + torbutton_log(5, "Version check failed! JSON parsing error: "+e); + return -1; + } + } else if (req.status == 404) { + // We're going to assume 404 means the service is not implemented yet. + torbutton_log(3, "Version check failed. Versions file is 404."); + return -1; + } + torbutton_log(5, "Version check failed! Web server error: "+req.status); + return -1; +} + + function torbutton_test_settings() { var wasEnabled = true; var ret = 0; @@ -2772,10 +2819,26 @@ function torbutton_set_launch_state(state, session_restore) { if (state) { torbutton_disable_tor(); torbutton_enable_tor(true); - torbutton_log(4, "Tor state updated."); + torbutton_log(3, "Tor state updated."); // Load our homepage again. We just killed it via the toggle. if (!session_restore) { + if (m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) { + var is_updated = torbutton_check_version(); + var locale = m_tb_prefs.getCharPref("general.useragent.locale"); + if (is_updated == 0) { + // In an ideal world, we'd just check for hasUserValue, but we can't do + // that, because we set browser.startup.homepage to have a user value already... + m_tb_prefs.setCharPref("browser.startup.homepage", + "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=0"); + } else if (is_updated == 1) { + var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); + if (homepage.indexOf("https://check.torproject.org/") == 0) { + m_tb_prefs.setCharPref("browser.startup.homepage", + "https://check.torproject.org/?lang="+locale+"&small=1&uptodate=1"); + } + } + } var homepage = m_tb_prefs.getCharPref("browser.startup.homepage"); gBrowser.loadURI(homepage, null, null); } diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index ecb74a0..b78a15b 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -26,6 +26,8 @@ pref("extensions.torbutton.locked_mode",false); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); pref("extensions.torbutton.test_failed",false); pref("extensions.torbutton.no_proxies_on","127.0.0.1"); +pref("extensions.torbutton.versioncheck_url","https://check.torproject.org/RecommendedTBBVersions"); +pref("extensions.torbutton.versioncheck_enabled",true); // XXX: wtf prefs? These seem not actually connected, but govern // if user wants own tor proxy settings

1 0

[tor/master] fold in last changes item
by arma＠torproject.org 02 Sep '11

02 Sep '11

commit 589ed3f771f1d77d9d5e366ba60849c2babb49e0 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 1 20:49:21 2011 -0400 fold in last changes item --- ChangeLog | 2 ++ changes/bug3888 | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a28b2b2..7084a0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,8 @@ Changes in version 0.2.3.3-alpha - 2011-09-01 without flushing it completely. Fixes bug 3805. - Fix a bug where server-side tunneled bufferevent-based directory streams would get closed prematurely. Fixes bug 3814. + - Fix a use-after-free error with per-connection rate-limiting + buckets. Fixes bug 3888. o Major bugfixes (also part of 0.2.2.31-rc): - If we're configured to write our ControlPorts to disk, only write diff --git a/changes/bug3888 b/changes/bug3888 deleted file mode 100644 index d3a5e27..0000000 --- a/changes/bug3888 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (bufferevents, fix on 0.2.3.1-alpha): - - Fix a use-after-free error with per-connection rate-limiting - buckets. Fixes bug 3888. -

1 0

[torbutton/master] Bug #3879: Framed sites broken (yopmail, gmane, gmaps, etc)
by mikeperry＠torproject.org 02 Sep '11

02 Sep '11

commit 709c3fb7ef212e9b1b75db3d0a8512e4b03474ff Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Sep 1 17:28:18 2011 -0700 Bug #3879: Framed sites broken (yopmail, gmane, gmaps, etc) We were accidentally clearing the name attribute of framesets because we got notification before the referrer could be set on the channel. --- src/chrome/content/torbutton.js | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ee4b03e..6496895 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -4232,9 +4232,12 @@ function torbutton_hookdoc(win, doc, state_change, referrer) { // This keeps window.name clean between fresh urls. // It should also apply to iframes because hookdoc gets called for all // frames and subdocuments. - if (!referrer || referrer.spec == "") { - win.name = null; - win.window.name = null; + // + // The about:blank check handles the 'name' attribute of framesets, which + // get set before the referer is set on the channel. + if ((!referrer || referrer.spec == "") && win.location != "about:blank") { + win.name = ""; + win.window.name = ""; } } catch(e) { torbutton_log(4, "Failed to reset window.name: "+e)

1 0