diff options
| author | teor <teor2345@gmail.com> | 2017-11-22 01:50:46 +1100 |
|---|---|---|
| committer | teor <teor2345@gmail.com> | 2017-11-22 02:00:34 +1100 |
| commit | 690f646bf8a5de9b099fb5295ba9ff252e5606f4 (patch) | |
| tree | e45732bbcfbcde8fc5b3aa384f13ffc7a2d65cd3 /src/or/directory.c | |
| parent | da82e0b5795c449f4442c87e065e9a60da4892a8 (diff) | |
| download | tor-690f646bf8a5de9b099fb5295ba9ff252e5606f4.tar.gz tor-690f646bf8a5de9b099fb5295ba9ff252e5606f4.zip | |
Stop checking cached bridge descriptors for usable bridges
Stop checking for bridge descriptors when we actually want to know if
any bridges are usable. This avoids potential bootstrapping issues.
Fixes bug 24367; bugfix on 0.2.0.3-alpha.
Stop stalling when bridges are changed at runtime. Stop stalling when
old bridge descriptors are cached, but they are not in use.
Fixes bug 24367; bugfix on 23347 in 0.3.2.1-alpha.
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 66bdef2361..e49fd595c9 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -5338,7 +5338,7 @@ find_dl_schedule(const download_status_t *dls, const or_options_t *options) } case DL_SCHED_BRIDGE: /* A bridge client downloading bridge descriptors */ - if (options->UseBridges && any_bridge_descriptors_known()) { + if (options->UseBridges && num_bridges_usable() > 0) { /* A bridge client with one or more running bridges */ return options->TestingBridgeDownloadSchedule; } else { |