[or-cvs] r12659: backport r12658 (in tor/branches/tor-0_1_2-patches: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-12-03 17:47:18 -0500 (Mon, 03 Dec 2007)
New Revision: 12659

Modified:
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/routerparse.c
Log:
backport r12658


Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-12-03 22:31:59 UTC (rev 12658)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-12-03 22:47:18 UTC (rev 12659)
@@ -8,11 +8,14 @@
 
   o Major bugfixes:
     - When the clock jumps forward a lot, do not allow the bandwidth
-      buckets to become negative.  Fixes Bug 544.
+      buckets to become negative. Fixes bug 544.
     - Fix a memory leak on exit relays; we were leaking a cached_resolve_t
       on every successful resolve. Reported by Mike Perry.
     - Purge old entries from the "rephist" database and the hidden
       service descriptor database even when DirPort is zero.
+    - Stop thinking that 0.1.2.x directory servers can handle "begin_dir"
+      requests. Should ease bugs 406 and 419 where 0.1.2.x relays are
+      crashing or mis-answering these requests.
 
   o Minor bugfixes:
     - Changing the ExitPolicyRejectPrivate setting should cause us to

Modified: tor/branches/tor-0_1_2-patches/src/or/routerparse.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/routerparse.c	2007-12-03 22:31:59 UTC (rev 12658)
+++ tor/branches/tor-0_1_2-patches/src/or/routerparse.c	2007-12-03 22:47:18 UTC (rev 12659)
@@ -1133,7 +1133,7 @@
       rs->version_supports_begindir = 1;
     } else {
       rs->version_supports_begindir =
-        tor_version_as_new_as(tok->args[0], "0.1.2.2-alpha");
+        tor_version_as_new_as(tok->args[0], "0.2.0.1-alpha");
     }
   }