- tor-commits - lists.torproject.org

[tor/release-0.2.2] fold in 0.2.2.35 items so far
by arma＠torproject.org 30 Oct '11

30 Oct '11

commit 3b39ec40fd057c8975167becba6907a6862c73d4 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Oct 29 20:13:59 2011 -0400 fold in 0.2.2.35 items so far --- ChangeLog | 17 +++++++++++++++++ changes/bug4299 | 5 ----- changes/bug4331 | 4 ---- changes/bug4340 | 5 ----- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index af378f5..0457134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Changes in version 0.2.2.35 - 2011-1?-?? + o Major bugfix: + - If we mark an OR connection for close based on a cell we process, + don't process any further cells on it. We already avoided reading + on marked-for-close connections, but now we also discard the cells + we'd already read. Fixes bug 4299; bugfix on 0.2.0.10-alpha, which + was the first version where we might mark a connection for close + based on processing a cell on it. + - Don't crash when we're running as a relay and don't have a geoip + file. Bugfix on 0.2.2.34; fixes bug 4340. This backports a fix + we've had in the 0.2.3.x branch already. + + o Trivial fixes: + - Fix a typo in a hibernation-related log message. Fixes bug 4331; + bugfix on 0.2.2.23-alpha; found by "tmpname0901". + + Changes in version 0.2.2.34 - 2011-10-26 Tor 0.2.2.34 fixes a critical anonymity vulnerability where an attacker can deanonymize Tor users. Everybody should upgrade. diff --git a/changes/bug4299 b/changes/bug4299 deleted file mode 100644 index c43d814..0000000 --- a/changes/bug4299 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfix: - - Do not process cells on a marked-for-close connection. We previously - avoided this by not calling read handlers on marked connections, but - that's not adequate for the case when cells are very small. Fixes - bug 4299; bugfix on 0.2.0.20-rc which first made small cells possible. diff --git a/changes/bug4331 b/changes/bug4331 deleted file mode 100644 index 011238a..0000000 --- a/changes/bug4331 +++ /dev/null @@ -1,4 +0,0 @@ - o Trivial fixes: - - Fixed a typo in a hibernation-related log message. Fixes bug 4331; - bugfix on 0.2.2.23-alpha; found by "tmpname0901". - diff --git a/changes/bug4340 b/changes/bug4340 deleted file mode 100644 index 08098b1..0000000 --- a/changes/bug4340 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Don't crash when we're running as a relay and don't have a geoip - file. Bugfix on tor-0.2.2.34; fixes bug 4340. This backports a fix - we've had in master already. -

1 0

[weather/master] Fix syntax error in in version handling
by kaner＠torproject.org 29 Oct '11

29 Oct '11

commit 60c790ddb59c7ae47039b6cb9aaf0d956ed726d4 Author: Christian Fromme <kaner(a)strace.org> Date: Thu Jun 30 19:02:39 2011 +0200 Fix syntax error in in version handling --- weather/weatherapp/ctlutil.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/weather/weatherapp/ctlutil.py b/weather/weatherapp/ctlutil.py index 93c6318..e5aeca4 100644 --- a/weather/weatherapp/ctlutil.py +++ b/weather/weatherapp/ctlutil.py @@ -288,7 +288,7 @@ class CtlUtil: # in the `recommended' list if client_version.endswith("-dev"): version_list.append(client_version) - if get_highest_version(version_list) == client_version: + if self.get_highest_version(version_list) == client_version: return 'RECOMMENDED' # If 0.2.1.34 is stable, that means 0.2.1.34-dev is fine, too. nondev_name = client_version.replace("-dev", "")

1 0

[weather/master] Add a patch from Andrew to correct email sendings by Weather
by kaner＠torproject.org 29 Oct '11

29 Oct '11

commit 378bf6948a477e808976302cbec477dd9c646c3e Author: Christian Fromme <kaner(a)strace.org> Date: Sun Oct 30 01:04:59 2011 +0200 Add a patch from Andrew to correct email sendings by Weather --- weather/settings.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/weather/settings.py b/weather/settings.py index ea17f80..9cf0ae1 100644 --- a/weather/settings.py +++ b/weather/settings.py @@ -7,7 +7,7 @@ DEBUG = False #set to true to see stack traces instead of standard html errors TEMPLATE_DEBUG = DEBUG ADMINS = ( - ('Tor Admins', 'tor-admins(a)torproject.org'), + ('Tor Admins', 'torproject-admin(a)torproject.org'), ) MANAGERS = ADMINS

1 0

[gettor/master] Small fix for Andrew's patches
by kaner＠torproject.org 29 Oct '11

29 Oct '11

commit 57b2db698ba35e9499d93c6566c220ed3291ab78 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Oct 30 00:42:25 2011 +0200 Small fix for Andrew's patches --- lib/gettor/packages.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/gettor/packages.py b/lib/gettor/packages.py index 0f205c1..9388361 100644 --- a/lib/gettor/packages.py +++ b/lib/gettor/packages.py @@ -245,7 +245,7 @@ class Packages: if not silent: self.rsync += "--progress" self.rsync += " " - self.rsync += "rsync://%s/tor/dist/" % mirror + self.rsync += "%s/dist/" % mirror self.rsync += " " self.rsync += self.distDir + "/"

1 0

[gettor/master] Add patches that Andrew came up with in context of #4342:
by kaner＠torproject.org 29 Oct '11

29 Oct '11

commit 0780287aa5853b96d093f6396200ec219e8faf43 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Oct 30 00:25:06 2011 +0200 Add patches that Andrew came up with in context of #4342: - Fix the gettor source code repository URL - Adjust the copyright year - Change the default rsync host --- gettor.conf | 2 +- lib/GetTor.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gettor.conf b/gettor.conf index 0d57c35..233b4b9 100644 --- a/gettor.conf +++ b/gettor.conf @@ -31,7 +31,7 @@ BLACKLIST_BY_TYPE = True BLACKLIST_THRES = 3 # Which mirror to sync packages from -RSYNC_MIRROR = "rsync.torproject.org" +RSYNC_MIRROR = "aroides.torproject.org::website-mirror" # Which email provider allows for what size of attachments? (Size in MB) PROVIDER_ATTACHMENT_SIZES = { "gmail.com": 25, diff --git a/lib/GetTor.py b/lib/GetTor.py index eb5505a..8a25e6f 100644 --- a/lib/GetTor.py +++ b/lib/GetTor.py @@ -2,9 +2,9 @@ # -*- coding: utf-8 -*- __program__ = 'GetTor.py' -__url__ = 'https://svn.torproject.org/svn/projects/gettor' +__url__ = 'https://gitweb.torproject.org/gettor.git' __author__ = 'Jacob Appelbaum <jacob(a)appelbaum.net>, Christian Fromme <kaner(a)strace.org>' -__copyright__ = 'Copyright (c) 2008, 2009, The Tor Project' +__copyright__ = 'Copyright (c) 2008-2011, The Tor Project' __license__ = 'See LICENSE for licensing information' try:

1 0

[tor/release-0.2.2] Fix typo, spotted by tmpname0901. Thanks!
by arma＠torproject.org 29 Oct '11

29 Oct '11

commit f6b1dc2805ce23d4f7fddcf2714b13f718d20038 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Oct 28 11:19:16 2011 +0200 Fix typo, spotted by tmpname0901. Thanks! --- changes/bug4331 | 4 ++++ src/or/hibernate.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug4331 b/changes/bug4331 new file mode 100644 index 0000000..011238a --- /dev/null +++ b/changes/bug4331 @@ -0,0 +1,4 @@ + o Trivial fixes: + - Fixed a typo in a hibernation-related log message. Fixes bug 4331; + bugfix on 0.2.2.23-alpha; found by "tmpname0901". + diff --git a/src/or/hibernate.c b/src/or/hibernate.c index aebce4c..2f7170f 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -943,7 +943,7 @@ consider_hibernation(time_t now) if (hibernate_soft_limit_reached()) { log_notice(LD_ACCT, "Bandwidth soft limit reached; commencing hibernation. " - "No new conncetions will be accepted"); + "No new connections will be accepted"); hibernate_begin(HIBERNATE_STATE_LOWBANDWIDTH, now); } else if (accounting_enabled && now < interval_wakeup_time) { format_local_iso_time(buf,interval_wakeup_time);

1 0

[tor/release-0.2.2] Discard all cells on a marked connection
by arma＠torproject.org 29 Oct '11

29 Oct '11

commit cf8bffa35901a26ae840dcd715dd2f664259efb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 17:04:15 2011 -0400 Discard all cells on a marked connection Fix for bug 4299 --- changes/bug4299 | 5 +++++ src/or/command.c | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/changes/bug4299 b/changes/bug4299 new file mode 100644 index 0000000..c43d814 --- /dev/null +++ b/changes/bug4299 @@ -0,0 +1,5 @@ + o Major bugfix: + - Do not process cells on a marked-for-close connection. We previously + avoided this by not calling read handlers on marked connections, but + that's not adequate for the case when cells are very small. Fixes + bug 4299; bugfix on 0.2.0.20-rc which first made small cells possible. diff --git a/src/or/command.c b/src/or/command.c index 1fa8bc6..5271a7a 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -132,6 +132,9 @@ command_process_cell(cell_t *cell, or_connection_t *conn) #define PROCESS_CELL(tp, cl, cn) command_process_ ## tp ## _cell(cl, cn) #endif + if (conn->_base.marked_for_close) + return; + /* Reject all but VERSIONS and NETINFO when handshaking. */ if (handshaking && cell->command != CELL_VERSIONS && cell->command != CELL_NETINFO) @@ -205,6 +208,9 @@ command_process_var_cell(var_cell_t *cell, or_connection_t *conn) } #endif + if (conn->_base.marked_for_close) + return; + /* reject all when not handshaking. */ if (conn->_base.state != OR_CONN_STATE_OR_HANDSHAKING) return;

1 0

[tor/release-0.2.2] Disable stats requiring geoip info if we have none
by arma＠torproject.org 29 Oct '11

29 Oct '11

commit dfdb4fde1acbec20b5dedd91005dcf64c730c411 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Dec 22 08:34:41 2010 +0100 Disable stats requiring geoip info if we have none In other parts of the code we will otherwise attempt to collect these statistics, and that will lead to crashes. --- src/or/config.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 78e4336..ca4e71c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1425,6 +1425,7 @@ options_act(or_options_t *old_options) geoip_dirreq_stats_init(now); print_notice = 1; } else { + options->DirReqStatistics = 0; log_notice(LD_CONFIG, "Configured to measure directory request " "statistics, but no GeoIP database found! " "Please specify a GeoIP database using the " @@ -1437,6 +1438,7 @@ options_act(or_options_t *old_options) geoip_entry_stats_init(now); print_notice = 1; } else { + options->EntryStatistics = 0; log_notice(LD_CONFIG, "Configured to measure entry node " "statistics, but no GeoIP database found! " "Please specify a GeoIP database using the "

1 0

[tor/release-0.2.2] Add a changes file for the 4340 fix
by arma＠torproject.org 29 Oct '11

29 Oct '11

commit c5c5f859d37bc46f912cca9ba0fa0e1300062e40 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Oct 29 11:21:37 2011 +0200 Add a changes file for the 4340 fix --- changes/bug4340 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug4340 b/changes/bug4340 new file mode 100644 index 0000000..08098b1 --- /dev/null +++ b/changes/bug4340 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Don't crash when we're running as a relay and don't have a geoip + file. Bugfix on tor-0.2.2.34; fixes bug 4340. This backports a fix + we've had in master already. +

1 0

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

29 Oct '11

commit da068c9166d977484222426f1d2423d7ce4e0d5f Merge: f0e1ee9 c5c5f85 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Oct 29 16:26:01 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug4299 | 5 +++++ changes/bug4331 | 4 ++++ changes/bug4340 | 5 +++++ src/or/command.c | 6 ++++++ src/or/config.c | 2 ++ src/or/hibernate.c | 2 +- 6 files changed, 23 insertions(+), 1 deletions(-)

1 0