From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 23 Jan 2015 14:37:08 +0000 (-0500)
Subject: Tweak the 9969 fix a little
X-Git-Tag: tor-0.2.6.3-alpha~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c443e987d;p=thirdparty%2Ftor.git

Tweak the 9969 fix a little

If we have busy nodes and excluded nodes, then don't retry with the
excluded ones enabled.  Instead, wait for the busy ones to be nonbusy.
---

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 9f389a40f2..dacf980342 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1549,7 +1549,8 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags,
   smartlist_free(overloaded_direct);
   smartlist_free(overloaded_tunnel);
 
-  if (result == NULL && try_excluding && !options->StrictNodes && n_excluded) {
+  if (result == NULL && try_excluding && !options->StrictNodes && n_excluded
+      && !n_busy) {
     /* If we got no result, and we are excluding nodes, and StrictNodes is
      * not set, try again without excluding nodes. */
     try_excluding = 0;