- tor-commits - lists.torproject.org

[tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 28 Oct '11

28 Oct '11

commit 9c2ca5b52f0d8eb504cff0e80ac6366e87224ead Merge: 4684ced 5d30951 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 27 20:03:21 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 28 Oct '11

28 Oct '11

commit b6e37303587db1ca2b31c2f96e8a0a6df389b410 Merge: c4eae75 9c2ca5b Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 27 20:04:38 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2

1 0

[tor/release-0.2.2] bump maint to 0.2.1.31
by arma＠torproject.org 28 Oct '11

28 Oct '11

commit 5d3095152efb5c8f0d887be0bccdb154ded40a91 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 27 20:01:58 2011 -0400 bump maint to 0.2.1.31 --- 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 eead014..f654361 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.25) +AM_INIT_AUTOMAKE(tor, 0.2.1.31) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 6deb8d9..efb3208 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.1.25" +!define VERSION "0.2.1.31" !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 65804fe..12af228 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.25" +#define VERSION "0.2.1.31"

1 0

[tor/maint-0.2.2] bump maint to 0.2.1.31
by arma＠torproject.org 28 Oct '11

28 Oct '11

commit 5d3095152efb5c8f0d887be0bccdb154ded40a91 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 27 20:01:58 2011 -0400 bump maint to 0.2.1.31 --- 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 eead014..f654361 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.25) +AM_INIT_AUTOMAKE(tor, 0.2.1.31) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 6deb8d9..efb3208 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.1.25" +!define VERSION "0.2.1.31" !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 65804fe..12af228 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.25" +#define VERSION "0.2.1.31"

1 0

[tor/maint-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 28 Oct '11

28 Oct '11

commit 9c2ca5b52f0d8eb504cff0e80ac6366e87224ead Merge: 4684ced 5d30951 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 27 20:03:21 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2

1 0

[tor/release-0.2.1] bump maint to 0.2.1.31
by arma＠torproject.org 28 Oct '11

28 Oct '11

commit 5d3095152efb5c8f0d887be0bccdb154ded40a91 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 27 20:01:58 2011 -0400 bump maint to 0.2.1.31 --- 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 eead014..f654361 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.25) +AM_INIT_AUTOMAKE(tor, 0.2.1.31) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 6deb8d9..efb3208 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.1.25" +!define VERSION "0.2.1.31" !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 65804fe..12af228 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.25" +#define VERSION "0.2.1.31"

1 0

[tor/release-0.2.1] Merge branch 'maint-0.2.1' into release-0.2.1
by arma＠torproject.org 28 Oct '11

28 Oct '11

commit abd34f1527272f759d8b45bdf770385c2be2dbe8 Merge: e740ac0 5d30951 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 27 20:02:58 2011 -0400 Merge branch 'maint-0.2.1' into release-0.2.1

1 0

[tor/maint-0.2.1] bump maint to 0.2.1.31
by arma＠torproject.org 28 Oct '11

28 Oct '11

commit 5d3095152efb5c8f0d887be0bccdb154ded40a91 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 27 20:01:58 2011 -0400 bump maint to 0.2.1.31 --- 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 eead014..f654361 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.25) +AM_INIT_AUTOMAKE(tor, 0.2.1.31) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 6deb8d9..efb3208 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.1.25" +!define VERSION "0.2.1.31" !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 65804fe..12af228 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.25" +#define VERSION "0.2.1.31"

1 0

r25190: {website} bump all packages versions for tor 0.2.2.34 and 0.2.3.6-alph (website/trunk/include)
by Erinn Clark 27 Oct '11

27 Oct '11

Author: erinn Date: 2011-10-27 23:54:08 +0000 (Thu, 27 Oct 2011) New Revision: 25190 Modified: website/trunk/include/versions.wmi Log: bump all packages versions for tor 0.2.2.34 and 0.2.3.6-alpha Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-10-27 18:36:51 UTC (rev 25189) +++ website/trunk/include/versions.wmi 2011-10-27 23:54:08 UTC (rev 25190) @@ -1,34 +1,34 @@ -<define-tag version-stable whitespace=delete>0.2.2.33</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.5-alpha</define-tag> +<define-tag version-stable whitespace=delete>0.2.2.34</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.6-alpha</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.2.33</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.3.5-alpha</define-tag> +<define-tag version-win32-stable whitespace=delete>0.2.2.34</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.3.6-alpha</define-tag> -<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.33</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.5-alpha</define-tag> +<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.34</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.6-alpha</define-tag> -<define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.33-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.33-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.33-<version-vidalia-stable>-2</define-tag> +<define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable>-2</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.5-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.5-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.5-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.6-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.6-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.6-alpha-<version-vidalia-stable></define-tag> -<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.33</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.5-alpha</define-tag> +<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.34</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.6-alpha</define-tag> -<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.33</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.5-alpha</define-tag> +<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.34</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.6-alpha</define-tag> -<define-tag version-osx-x86-stable whitespace=delete>0.2.2.33</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.5-alpha</define-tag> +<define-tag version-osx-x86-stable whitespace=delete>0.2.2.34</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.6-alpha</define-tag> -<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.33</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.5-alpha</define-tag> +<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.34</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.6-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.33-3</define-tag> -<define-tag version-torbrowser-tor whitespace=delete>0.2.2.33</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.34-1</define-tag> +<define-tag version-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.14-stable, zlib-1.2.5, openssl-1.0.0e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>7.0.1</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> @@ -37,18 +37,18 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.33-3</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.33-3</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.33</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.34-1</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.34-1</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.14, zlib-1.2.5, openssl-1.0.0e</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>7.0.1</define-tag> -<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.4</define-tag> +<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>2.2.33-3</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.33</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>2.2.34-1</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.34</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>7.0.1</define-tag> -<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.4</define-tag> +<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.15</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.15</define-tag>

1 0

[tor/master] Don't give the Guard flag to relays without the CVE-2011-2768 fix
by arma＠torproject.org 27 Oct '11

27 Oct '11

commit 00fffbc1a15e2696a89c721d0c94dc333ff419ef Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Oct 25 00:24:15 2011 -0700 Don't give the Guard flag to relays without the CVE-2011-2768 fix --- changes/issue-2011-10-19L | 7 ++++ src/or/dirserv.c | 71 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 1 deletions(-) diff --git a/changes/issue-2011-10-19L b/changes/issue-2011-10-19L index 1fefd72..b879c9d 100644 --- a/changes/issue-2011-10-19L +++ b/changes/issue-2011-10-19L @@ -19,3 +19,10 @@ client is connected to a patched relay. Bugfix on FIXME; found by frosty_un. + - Don't assign the Guard flag to relays running a version of Tor + which would use an OR connection on which it has received a + CREATE_FAST cell to satisfy an EXTEND request. Mitigates + CVE-2011-2768, by ensuring that clients will not connect + directly to any relay which an attacker could probe for an + unpatched client's connections. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 6607901..fa7f693 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2251,6 +2251,74 @@ get_possible_sybil_list(const smartlist_t *routers) return omit_as_sybil; } +/** Return non-zero iff a relay running the Tor version specified in + * platform is suitable for use as a potential entry guard. */ +static int +is_router_version_good_for_possible_guard(const char *platform) +{ + static int parsed_versions_initialized = 0; + static tor_version_t first_good_0_2_1_guard_version; + static tor_version_t first_good_0_2_2_guard_version; + static tor_version_t first_good_later_guard_version; + + tor_version_t router_version; + + /* XXX023 This block should be extracted into its own function. */ + /* XXXX Begin code copied from tor_version_as_new_as (in routerparse.c) */ + { + char *s, *s2, *start; + char tmp[128]; + + tor_assert(platform); + + if (strcmpstart(platform,"Tor ")) /* nonstandard Tor; be safe and say yes */ + return 1; + + start = (char *)eat_whitespace(platform+3); + if (!*start) return 0; + s = (char *)find_whitespace(start); /* also finds '\0', which is fine */ + s2 = (char*)eat_whitespace(s); + if (!strcmpstart(s2, "(r") || !strcmpstart(s2, "(git-")) + s = (char*)find_whitespace(s2); + + if ((size_t)(s-start+1) >= sizeof(tmp)) /* too big, no */ + return 0; + strlcpy(tmp, start, s-start+1); + + if (tor_version_parse(tmp, &router_version)<0) { + log_info(LD_DIR,"Router version '%s' unparseable.",tmp); + return 1; /* be safe and say yes */ + } + } + /* XXXX End code copied from tor_version_as_new_as (in routerparse.c) */ + + if (!parsed_versions_initialized) { + /* CVE-2011-2769 was fixed on the relay side in Tor versions + * 0.2.1.31, 0.2.2.34, and 0.2.3.6-alpha. */ + tor_assert(tor_version_parse("0.2.1.31", + &first_good_0_2_1_guard_version)>=0); + tor_assert(tor_version_parse("0.2.2.34", + &first_good_0_2_2_guard_version)>=0); + tor_assert(tor_version_parse("0.2.3.6-alpha", + &first_good_later_guard_version)>=0); + + /* Don't parse these constant version strings once for every relay + * for every vote. */ + parsed_versions_initialized = 1; + } + + return ((tor_version_same_series(&first_good_0_2_1_guard_version, + &router_version) && + tor_version_compare(&first_good_0_2_1_guard_version, + &router_version) <= 0) || + (tor_version_same_series(&first_good_0_2_2_guard_version, + &router_version) && + tor_version_compare(&first_good_0_2_2_guard_version, + &router_version) <= 0) || + (tor_version_compare(&first_good_later_guard_version, + &router_version) <= 0)); +} + /** Extract status information from ri and from other authority * functions and store it in rs>. If naming, consider setting * the named flag in rs. @@ -2294,7 +2362,8 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, (router_get_advertised_bandwidth(ri) >= BANDWIDTH_TO_GUARANTEE_GUARD || router_get_advertised_bandwidth(ri) >= MIN(guard_bandwidth_including_exits, - guard_bandwidth_excluding_exits))) { + guard_bandwidth_excluding_exits)) && + is_router_version_good_for_possible_guard(ri->platform)) { long tk = rep_hist_get_weighted_time_known( ri->cache_info.identity_digest, now); double wfu = rep_hist_get_weighted_fractional_uptime(

1 0