r13317@catbus: nickm | 2007-06-08 14:39:59 -0400

 bugfix: we were undercounting the number of authorities that recommended any given version by 1.  Backport candidate.

svn:r10537

diff --git a/ChangeLog b/ChangeLog
index 10bb8fe84de342a56a816ae696694831f684ece7..889e34d3f45ffa5c62292ca1c317de9612a21609 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,7 +21,11 @@ Changes in version 0.2.0.3-alpha - 2007-??-??
   o Minor bugfixes (hidden services):
     - Stop tearing down the whole circuit when the user asks for a
       connection to a port that the hidden service didn't configure.
-      Resolves bug 444.
+      Resolves bug 444.  [Bugfix on 0.1.2.x]
+
+  o Minor bugfixes (versioning):
+    - Stop under-counting the number of authorities that recommend each
+      version. [Bugfix on 0.1.2.x]
 
 
 Changes in version 0.2.0.2-alpha - 2007-06-02

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 75b23ece740c2edc94228df8d4923cb81f24633e..b01e2895bfccb8cc89a7dfc6d5a1617510cad5a2 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3712,12 +3712,19 @@ compute_recommended_versions(time_t now, int client,
       if (current && !strcmp(cp, current)) {
         ++n_seen;
       } else {
-        if (n_seen > n_versioning/2 && current)
+        if (current)
+          log_info(LD_DIR,"version %s is recommended by %d authorities",
+                    current, n_seen);
+        if (n_seen > n_versioning/2 && current) {
           smartlist_add(recommended, current);
-        n_seen = 0; /* XXXX020 shouldn't this be 1? */
+        }
+        n_seen = 1;
         current = cp;
       }
     });
+  if (current)
+    log_info(LD_DIR,"version %s is recommended by %d authorities",
+             current, n_seen);
   if (n_seen > n_versioning/2 && current)
     smartlist_add(recommended, current);