[or-cvs] r12522: The fix in 0.2.0.12-alpha cleared the "hsdir" flag in v3 net (in tor/trunk: . contrib src/or src/win32)

[arma at seul.org]

Author: arma
Date: 2007-11-17 02:00:14 -0500 (Sat, 17 Nov 2007)
New Revision: 12522

Modified:
   tor/trunk/ChangeLog
   tor/trunk/configure.in
   tor/trunk/contrib/tor-mingw.nsi.in
   tor/trunk/src/or/dirserv.c
   tor/trunk/src/win32/orconfig.h
Log:
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.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-17 03:55:39 UTC (rev 12521)
+++ tor/trunk/ChangeLog	2007-11-17 07:00:14 UTC (rev 12522)
@@ -1,3 +1,10 @@
+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.
@@ -4,13 +11,15 @@
     - 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 @@
       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 @@
   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

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2007-11-17 03:55:39 UTC (rev 12521)
+++ tor/trunk/configure.in	2007-11-17 07:00:14 UTC (rev 12522)
@@ -4,7 +4,7 @@
 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

Modified: tor/trunk/contrib/tor-mingw.nsi.in
===================================================================
--- tor/trunk/contrib/tor-mingw.nsi.in	2007-11-17 03:55:39 UTC (rev 12521)
+++ tor/trunk/contrib/tor-mingw.nsi.in	2007-11-17 07:00:14 UTC (rev 12522)
@@ -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/"
 

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-11-17 03:55:39 UTC (rev 12521)
+++ tor/trunk/src/or/dirserv.c	2007-11-17 07:00:14 UTC (rev 12522)
@@ -2241,7 +2241,7 @@
       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)) {

Modified: tor/trunk/src/win32/orconfig.h
===================================================================
--- tor/trunk/src/win32/orconfig.h	2007-11-17 03:55:39 UTC (rev 12521)
+++ tor/trunk/src/win32/orconfig.h	2007-11-17 07:00:14 UTC (rev 12522)
@@ -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"