From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 9 Mar 2012 19:23:23 +0000 (-0500)
Subject: Revise "sufficient exit nodes" check to work with restrictive ExitNodes
X-Git-Tag: tor-0.2.3.13-alpha~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8abfcc080424654ae755de352999b3346ebcbb28;p=thirdparty%2Ftor.git

Revise "sufficient exit nodes" check to work with restrictive ExitNodes

If you set ExitNodes so that only 1 exit node is accepted, the
previous patch would have made you unable to build circuits.
---

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f9d2e8543c..86cdb83d9d 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4902,12 +4902,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. */