diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-23 09:37:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-23 09:37:08 -0500 |
| commit | 6c443e987d318aabb92fc8acc25cf6ce82692118 (patch) | |
| tree | 0aa5da579c8e0c600cd271fa3c18cc97189cb1d1 /src | |
| parent | 5d4bb6f61f360ddcbee83476ff2f93a13f3a19c0 (diff) | |
| download | tor-6c443e987d318aabb92fc8acc25cf6ce82692118.tar.gz tor-6c443e987d318aabb92fc8acc25cf6ce82692118.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/routerlist.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |