summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-03-11 20:37:21 -0500
committerRoger Dingledine <arma@torproject.org>2011-03-11 20:37:21 -0500
commit600ad7bf8d499d04259586bcf91afed7dfb88f99 (patch)
tree9fe6247b2611bf9dff6292fa6079cb299ab6cc0d /src
parent879f1718ad59682387ffc54b9d8589badb5f1e81 (diff)
parent2f8e96b5535481e157486944c8d7637f31e1a197 (diff)
downloadtor-600ad7bf8d499d04259586bcf91afed7dfb88f99.tar.gz
tor-600ad7bf8d499d04259586bcf91afed7dfb88f99.zip
Merge commit 'sebastian/bug2663' into maint-0.2.2
Diffstat (limited to 'src')
-rw-r--r--src/or/dirvote.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 529b45c7d5..9273dbc90d 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -3080,7 +3080,7 @@ dirvote_compute_consensuses(void)
n_votes = smartlist_len(pending_vote_list);
if (n_votes <= n_voters/2) {
log_warn(LD_DIR, "We don't have enough votes to generate a consensus: "
- "%d of %d", n_votes, n_voters/2);
+ "%d of %d", n_votes, n_voters/2+1);
goto err;
}
tor_assert(pending_vote_list);