summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-06-08 18:46:18 +0000
committerNick Mathewson <nickm@torproject.org>2007-06-08 18:46:18 +0000
commitf647ff501fc52e22209af98b4cc16f127ab00f3d (patch)
treeb79082a19da2dae4a81ffc08f7228ef928a7e0c8
parent39d52ec93a0dcfe86d0cc75d4ac4e8fd0a4a6928 (diff)
downloadtor-f647ff501fc52e22209af98b4cc16f127ab00f3d.tar.gz
tor-f647ff501fc52e22209af98b4cc16f127ab00f3d.zip
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. svn:r10538
-rw-r--r--ChangeLog2
-rw-r--r--src/or/routerlist.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6cea4e7e47..f2f9cbb520 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ Changes in version 0.1.2.15 - 2007-0?-??
- 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
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 9c25851737..1bec32ddd2 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3235,7 +3235,7 @@ compute_recommended_versions(time_t now, int client,
} else {
if (n_seen > n_versioning/2 && current)
smartlist_add(recommended, current);
- n_seen = 0;
+ n_seen = 1;
current = cp;
}
});