diff options
| author | Roger Dingledine <arma@torproject.org> | 2016-10-01 16:34:17 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2016-10-01 16:34:17 -0400 |
| commit | bfaded9143d127cb32407a7a58159383fa9ed333 (patch) | |
| tree | 1cfe84789182294f7a5c49495e36733197771ae5 /src/or/microdesc.c | |
| parent | 53255e925c474f9d5cb30c1de4da025e6d709e9a (diff) | |
| download | tor-bfaded9143d127cb32407a7a58159383fa9ed333.tar.gz tor-bfaded9143d127cb32407a7a58159383fa9ed333.zip | |
Bridge-using clients now use their cached microdesc consensus
Clients that use bridges were ignoring their cached microdesc-flavor
consensus files, because they only thought they should use the microdesc
flavor once they had a known-working bridge that could offer microdescs,
and at first boot no bridges are known-working.
This bug caused bridge-using clients to download a new microdesc consensus
on each startup.
Fixes bug 20269; bugfix on 0.2.3.12-alpha.
Diffstat (limited to 'src/or/microdesc.c')
| -rw-r--r-- | src/or/microdesc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/or/microdesc.c b/src/or/microdesc.c index a81dc54628..57efc725a0 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -920,11 +920,7 @@ we_use_microdescriptors_for_circuits(const or_options_t *options) int ret = options->UseMicrodescriptors; if (ret == -1) { /* UseMicrodescriptors is "auto"; we need to decide: */ - /* If we are configured to use bridges and none of our bridges - * know what a microdescriptor is, the answer is no. */ - if (options->UseBridges && !any_bridge_supports_microdescriptors()) - return 0; - /* Otherwise, we decide that we'll use microdescriptors iff we are + /* We'll use microdescriptors iff we are * not a server, and we're not autofetching everything. */ /* XXXX++ what does not being a server have to do with it? also there's * a partitioning issue here where bridges differ from clients. */ |