From 94dccce3faee409df1c8d1031fee1be6d6d51da6 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 15 Mar 2010 18:08:29 -0400 Subject: [PATCH 1/3] bump to 0.2.1.25 it's perfect, let's ship it --- ChangeLog | 2 +- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2efce8c04..157fabe165 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.1.25 - 2010-03-?? +Changes in version 0.2.1.25 - 2010-03-15 o Major bugfixes: - Fix a regression from our patch for bug 1244 that caused relays to guess their IP address incorrectly if they didn't set Address diff --git a/configure.in b/configure.in index f84d10b0f2..34544e27ac 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.24-dev) +AM_INIT_AUTOMAKE(tor, 0.2.1.25) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 9f747d708e..36239a3fb4 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.24-dev" +!define VERSION "0.2.1.25" !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 49bb58376d..65804fe19d 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.24-dev" +#define VERSION "0.2.1.25" From 6b7e5eb5f1ee9d6ef24cbe7d96fa5388f7a54bf0 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 16 Mar 2010 00:44:30 -0400 Subject: [PATCH 2/3] give us a blurb; add stanza to the releasenotes --- ChangeLog | 6 +++++- ReleaseNotes | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 157fabe165..ec7d92065f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -Changes in version 0.2.1.25 - 2010-03-15 +Changes in version 0.2.1.25 - 2010-03-16 + Tor 0.2.1.25 fixes a regression introduced in 0.2.1.23 that could + prevent relays from guessing their IP address correctly. It also fixes + several minor potential security bugs. + o Major bugfixes: - Fix a regression from our patch for bug 1244 that caused relays to guess their IP address incorrectly if they didn't set Address diff --git a/ReleaseNotes b/ReleaseNotes index ee0097a787..daac38c44a 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,30 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.1.25 - 2010-03-16 + Tor 0.2.1.25 fixes a regression introduced in 0.2.1.23 that could + prevent relays from guessing their IP address correctly. It also fixes + several minor potential security bugs. + + o Major bugfixes: + - Fix a regression from our patch for bug 1244 that caused relays + to guess their IP address incorrectly if they didn't set Address + in their torrc and/or their address fails to resolve. Bugfix on + 0.2.1.23; fixes bug 1269. + - When freeing a session key, zero it out completely. We only zeroed + the first ptrsize bytes. Bugfix on 0.0.2pre8. Discovered and + patched by ekir. Fixes bug 1254. + + o Minor bugfixes: + - Fix a dereference-then-NULL-check sequence when publishing + descriptors. Bugfix on 0.2.1.5-alpha. Discovered by ekir; fixes + bug 1255. + - Fix another dereference-then-NULL-check sequence. Bugfix on + 0.2.1.14-rc. Discovered by ekir; fixes bug 1256. + - Make sure we treat potentially not NUL-terminated strings correctly. + Bugfix on 0.1.1.13-alpha. Discovered by rieo; fixes bug 1257. + + Changes in version 0.2.1.24 - 2010-02-21 Tor 0.2.1.24 makes Tor work again on the latest OS X -- this time for sure! From 0324d3b0ec6d8ee0ec24c2e93915c9aa70e1665d Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sat, 3 Apr 2010 21:53:29 -0400 Subject: [PATCH 3/3] fetch relay descriptors from v3 authorities --- changes/1324-fetch-from-v3-not-v2 | 5 +++++ src/or/directory.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 changes/1324-fetch-from-v3-not-v2 diff --git a/changes/1324-fetch-from-v3-not-v2 b/changes/1324-fetch-from-v3-not-v2 new file mode 100644 index 0000000000..7026980558 --- /dev/null +++ b/changes/1324-fetch-from-v3-not-v2 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Directory mirrors were fetching relay descriptors only from v2 + directory authorities, rather than v3 authorities like they should. + Only 2 v2 authorities remain (compared to 7 v3 authorities), leading + to a serious bottleneck. Bugfix on 0.2.0.9-alpha. Fixes bug 1324. diff --git a/src/or/directory.c b/src/or/directory.c index 4153bca51b..7ec97d48e0 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -128,6 +128,8 @@ authority_type_to_string(authority_type_t auth) smartlist_add(lst, (void*)"V1"); if (auth & V2_AUTHORITY) smartlist_add(lst, (void*)"V2"); + if (auth & V3_AUTHORITY) + smartlist_add(lst, (void*)"V3"); if (auth & BRIDGE_AUTHORITY) smartlist_add(lst, (void*)"Bridge"); if (auth & HIDSERV_AUTHORITY) @@ -309,12 +311,14 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, case DIR_PURPOSE_FETCH_EXTRAINFO: type = EXTRAINFO_CACHE | (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : - V2_AUTHORITY); + V3_AUTHORITY); break; case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: + type = V2_AUTHORITY; + break; case DIR_PURPOSE_FETCH_SERVERDESC: type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : - V2_AUTHORITY); + V3_AUTHORITY); break; case DIR_PURPOSE_FETCH_RENDDESC: type = HIDSERV_AUTHORITY;