commit 6c443e987d318aabb92fc8acc25cf6ce82692118 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 23 09:37:08 2015 -0500 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. --- src/or/routerlist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 9f389a4..dacf980 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;