summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-03-09 14:25:18 -0500
committerNick Mathewson <nickm@torproject.org>2012-03-09 14:25:18 -0500
commit978cfcfbbb9d7960d081fd1eb26b0706cb296f3c (patch)
tree1397314d74073a06c559973682f94b6e2d1e9b12 /src
parentd4526e1d4a02b3faa6b7b6030a634cbe20bea9f2 (diff)
parent8abfcc080424654ae755de352999b3346ebcbb28 (diff)
downloadtor-978cfcfbbb9d7960d081fd1eb26b0706cb296f3c.tar.gz
tor-978cfcfbbb9d7960d081fd1eb26b0706cb296f3c.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src')
-rw-r--r--src/or/routerlist.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index a9946b8f97..160f340dcf 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5017,12 +5017,6 @@ update_router_have_minimum_dir_info(void)
res = 0;
control_event_bootstrap(BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS, 0);
goto done;
- } else if (num_exit_present < 2) {
- tor_snprintf(dir_info_status, sizeof(dir_info_status),
- "Only %d descriptor%s here and believed reachable!",
- num_exit_present, num_exit_present ? "" : "s");
- res = 0;
- goto done;
}
/* Check for entry nodes. */