[or-cvs] [tor/master 2/2] Changes to bug1959_part1 on review from arma.
nickm at torproject.org
nickm at torproject.org
Wed Sep 22 05:33:47 UTC 2010
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed, 22 Sep 2010 01:30:23 -0400
Subject: Changes to bug1959_part1 on review from arma.
Commit: 4ef9ccc88375b2dc5e421f2bf974b098ea9249a5
Significant one: we want to say "not enough entry nodes descriptors, so we
can't build circuits" only when we have 0 descriptors.
---
src/or/routerlist.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 18d2721..f88a99e 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4779,10 +4779,10 @@ update_router_have_minimum_dir_info(void)
/* Check for entry nodes. */
if (options->EntryNodes) {
- count_usable_descriptors(&num_present, &num_usable, consensus, options, now,
- options->EntryNodes);
+ count_usable_descriptors(&num_present, &num_usable, consensus, options,
+ now, options->EntryNodes);
- if (num_usable && (num_present==0 || num_present < num_usable / 4)) {
+ if (num_usable && (num_present == 0)) {
tor_snprintf(dir_info_status, sizeof(dir_info_status),
"We have only %d/%d usable entry node descriptors.",
num_present, num_usable);
--
1.7.1
More information about the tor-commits
mailing list