From c336dedd2148de33e41ee1482e334c96616e2b9b Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sat, 17 Nov 2007 07:00:14 +0000 Subject: [PATCH] The fix in 0.2.0.12-alpha cleared the "hsdir" flag in v3 network consensus documents when there are too many relays at a single IP address. Now clear it in v2 network status documents too. svn:r12522 --- ChangeLog | 19 ++++++++++++++----- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/or/dirserv.c | 2 +- src/win32/orconfig.h | 2 +- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e304e580e..e443924437 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,25 @@ +Changes in version 0.2.0.13-alpha - 2007-11-?? + o Minor bugfixes: + - The fix in 0.2.0.12-alpha cleared the "hsdir" flag in v3 network + consensus documents when there are too many relays at a single + IP address. Now clear it in v2 network status documents too. + + Changes in version 0.2.0.12-alpha - 2007-11-16 o Compile fixes: - Make it build on OpenBSD again. Patch from tup. - Substitute BINDIR and LOCALSTATEDIR in scripts. Fixes package-building for Red Hat, OS X, etc. - o Minor bugfixes: + o Minor bugfixes (on 0.1.2.x): + - Changing the ExitPolicyRejectPrivate setting should cause us to + rebuild our server descriptor. + + o Minor bugfixes (on 0.2.0.x): - When we're lacking a consensus, don't try to perform rendezvous operations. Reported by Karsten Loesing. - Fix a small memory leak whenever we decide against using a newly picked entry guard. Reported by Mike Perry. - - Changing the ExitPolicyRejectPrivate setting should cause us to - rebuild our server descriptor. - When authorities detected more than two relays running on the same IP address, they were clearing all the status flags but forgetting to clear the "hsdir" flag. So clients were being told that a @@ -38,7 +47,7 @@ Changes in version 0.2.0.11-alpha - 2007-11-12 relay's public (external) IP address too, unless ExitPolicyRejectPrivate is turned off. We do this because too many relays are running nearby to services that trust them based - on network address. + on network address. Bugfix on 0.1.2.x. o Major bugfixes: - Fix a memory leak on exit relays; we were leaking a cached_resolve_t @@ -64,7 +73,7 @@ Changes in version 0.2.0.11-alpha - 2007-11-12 o Minor bugfixes: - Don't reevaluate all the information from our consensus document just because we've downloaded a v2 networkstatus that we intend - to cache. Fixes bug 545. + to cache. Fixes bug 545; bugfix on 0.2.0.x. Changes in version 0.2.0.10-alpha - 2007-11-10 diff --git a/configure.in b/configure.in index 20f9fd4ce6..a5aeb47439 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.0.12-alpha) +AM_INIT_AUTOMAKE(tor, 0.2.0.12-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 3324287e49..f18661da64 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -5,7 +5,7 @@ ; !include "MUI.nsh" -!define VERSION "0.2.0.12-alpha" +!define VERSION "0.2.0.12-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 39263467d3..27092fdb7b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2241,7 +2241,7 @@ generate_v2_networkstatus_opinion(void) if (digestmap_get(omit_as_sybil, ri->cache_info.identity_digest)) { rs.is_authority = rs.is_exit = rs.is_stable = rs.is_fast = rs.is_running = rs.is_named = rs.is_valid = rs.is_v2_dir = - rs.is_possible_guard = 0; + rs.is_hs_dir = rs.is_possible_guard = 0; } if (routerstatus_format_entry(outp, endp-outp, &rs, version, 0)) { diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 55ac183476..7f4e0ca994 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -227,6 +227,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.0.12-alpha" +#define VERSION "0.2.0.12-alpha-dev"