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/circuituse.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/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index aa0df95652..8c9859bab7 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2084,7 +2084,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, "used client functionality lately" : "received a consensus with exits", options->UseBridges ? "bridges" : "entrynodes"); - } else if (!options->UseBridges || any_bridge_descriptors_known()) { + } else if (!options->UseBridges || num_bridges_usable() > 0) { log_fn(severity, LD_APP|LD_DIR, "Application request when we haven't %s. " "Optimistically trying directory fetches again.", |