- tor-commits - lists.torproject.org

[torbutton/master] Update changelog.
by mikeperry＠torproject.org 03 Sep '11

03 Sep '11

commit 0ab1a3abed970100c2b2291abed5473d82047f4e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Sep 3 05:00:56 2011 -0700 Update changelog. --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 91411af..51bef80 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +1.4.2 + 3 Sep 2011 + * bug 3879: Fix broken framed sites (yopmail, gmane, gmaps, etc) + * bug 3337: Fetch check.tp.o page to check versions (TBB only) + * Bug 3754: Fix SafeCache OCSP errors (fix for TBB only) + 1.4.1 28 Aug 2011 * bug 523: Implement New Identity (for TBB only) diff --git a/src/install.rdf b/src/install.rdf index 822eb4c..af40be4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry & Kory Kirk</em:creator> <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id> - <em:version>1.4.1</em:version> + <em:version>1.4.2</em:version> <em:homepageURL>https://www.torproject.org/torbutton/</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

r25005: {website} 0.2.3.3-alpha is up (in website/trunk: . include)
by Roger Dingledine 03 Sep '11

03 Sep '11

Author: arma Date: 2011-09-03 08:44:45 +0000 (Sat, 03 Sep 2011) New Revision: 25005 Modified: website/trunk/Makefile website/trunk/include/versions.wmi Log: 0.2.3.3-alpha is up Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-09-02 11:15:48 UTC (rev 25004) +++ website/trunk/Makefile 2011-09-03 08:44:45 UTC (rev 25005) @@ -12,7 +12,7 @@ export TORGIT=/home/runa/tordev/tor/.git export STABLETAG=tor-0.2.2.32 -export DEVTAG=tor-0.2.3.2-alpha +export DEVTAG=tor-0.2.3.3-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-09-02 11:15:48 UTC (rev 25004) +++ website/trunk/include/versions.wmi 2011-09-03 08:44:45 UTC (rev 25005) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.2.32</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.2-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.3-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.32</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.2.32</define-tag>

1 0

[torbutton/master] Bug #3754: Fix SafeCache OCSP errors (fix for TBB only)
by mikeperry＠torproject.org 03 Sep '11

03 Sep '11

commit 2a7ed84c5f21d601c4ec92acce457322b822bd36 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 2 21:17:29 2011 -0700 Bug #3754: Fix SafeCache OCSP errors (fix for TBB only) We added a new interface in #3666. This fix uses that string interface and falls back to the old interface if it is not available. --- src/chrome/content/stanford-safecache.js | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index 4dd388d..1da6b02 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -89,11 +89,16 @@ SSC_RequestListener.prototype = }, setCacheKey: function(channel, str) { - var oldData = this.readCacheKey(channel.cacheKey); - var newKey = this.newCacheKey(this.getHash(str) + oldData); - channel.cacheKey = newKey; - SSC_dump("Set cache key to hash(" + str + ") = " + + try { + channel.cacheDomain = str; + SSC_dump("Set cacheDomain to "+str+" for "+channel.URI.spec); + } catch(e) { + var oldData = this.readCacheKey(channel); + var newKey = this.newCacheKey(this.getHash(str) + oldData); + channel.cacheKey = newKey; + SSC_dump("Set cache key to hash(" + str + ") = " + newKey.data + " for " + channel.URI.spec); + } }, onModifyRequest: function(channel) { @@ -136,7 +141,7 @@ SSC_RequestListener.prototype = // Same-origin policy var referrer; if (parent_host && parent_host != channel.URI.host) { - SSC_dump("Segmenting " + channel.URI.host + + SSC_dump("Segmenting " + channel.URI.spec + " content loaded by " + parent_host); this.setCacheKey(channel, parent_host); referrer = parent_host; @@ -154,7 +159,7 @@ SSC_RequestListener.prototype = } catch (e) {} } else { referrer = channel.URI.host; - if(!this.readCacheKey(channel.cacheKey)) { + if(!this.readCacheKey(channel)) { this.setCacheKey(channel, channel.URI.host); } else { SSC_dump("Existing cache key detected; leaving it unchanged."); @@ -300,9 +305,13 @@ SSC_RequestListener.prototype = }, // Read the integer data contained in a cache key - readCacheKey: function(key) { - key.QueryInterface(Components.interfaces.nsISupportsPRUint32); - return key.data; + readCacheKey: function(channel) { + try { + return channel.cacheDomain; + } catch(e) { + channel.cacheKey.QueryInterface(Components.interfaces.nsISupportsPRUint32); + return channel.cacheKey.data; + } }, // Construct a new cache key with some integer data

1 0

[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