diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-12-12 19:27:14 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-12-12 19:27:14 -0500 |
commit | 9abef516f609a619b25e8f53a413a2e3df05bde8 (patch) | |
tree | 2b80767e1ad490e20e4e2de034145594173b3171 /src/or/networkstatus.c | |
parent | 13455c0f1a191824d383339c9efcc3b31ecd8e6f (diff) | |
parent | bf89b089306067cffa4d2ca6b7fa7cd54790a961 (diff) | |
download | tor-9abef516f609a619b25e8f53a413a2e3df05bde8.tar.gz tor-9abef516f609a619b25e8f53a413a2e3df05bde8.zip |
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/or/networkstatus.c')
-rw-r--r-- | src/or/networkstatus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 61cca1b9b6..deef62bd40 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1218,7 +1218,9 @@ should_delay_dir_fetches(const or_options_t *options, const char **msg_out) } if (options->UseBridges) { - if (!any_bridge_descriptors_known()) { + /* If we know that none of our bridges can possibly work, avoid fetching + * directory documents. But if some of them might work, try again. */ + if (num_bridges_usable(1) == 0) { if (msg_out) { *msg_out = "No running bridges"; } |