diff options
author | Nick Mathewson <nickm@torproject.org> | 2010-09-22 01:30:23 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-09-22 01:30:23 -0400 |
commit | 4ef9ccc88375b2dc5e421f2bf974b098ea9249a5 (patch) | |
tree | 44c8b5c7cb6cdf4aa2b6edc6669678e000b1ecc7 | |
parent | 49c177437bd17c353891a07ac4996c13b792bd14 (diff) | |
download | tor-4ef9ccc88375b2dc5e421f2bf974b098ea9249a5.tar.gz tor-4ef9ccc88375b2dc5e421f2bf974b098ea9249a5.zip |
Changes to bug1959_part1 on review from arma.
Significant one: we want to say "not enough entry nodes descriptors, so we
can't build circuits" only when we have 0 descriptors.
-rw-r--r-- | 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 18d2721405..f88a99e046 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); |