[or-cvs] r10538: Backport r10537: bugfix: we were undercounting the number of (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-06-08 14:46:18 -0400 (Fri, 08 Jun 2007)
New Revision: 10538

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/or/routerlist.c
Log:
 r13323@catbus:  nickm | 2007-06-08 14:45:28 -0400
 Backport r10537: bugfix: we were undercounting the number of authorities that recommended any given version by 1.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r13323] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-06-08 18:41:19 UTC (rev 10537)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-06-08 18:46:18 UTC (rev 10538)
@@ -3,6 +3,8 @@
     - Fix compile on FreeBSD/NetBSD/OpenBSD. Oops.
     - Try even harder not to dereference the first character after
       an mmap(). (Bug reported by lodger)
+    - Count the number of authorities that recommend each version
+      correctly.  Previously, we were under-counting by 1.
 
 
 Changes in version 0.1.2.14 - 2007-05-25

Modified: tor/branches/tor-0_1_2-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2007-06-08 18:41:19 UTC (rev 10537)
+++ tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2007-06-08 18:46:18 UTC (rev 10538)
@@ -3235,7 +3235,7 @@
       } else {
         if (n_seen > n_versioning/2 && current)
           smartlist_add(recommended, current);
-        n_seen = 0;
+        n_seen = 1;
         current = cp;
       }
     });