diff options
author | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:10:39 -0500 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:10:39 -0500 |
commit | 1bdccc03a94c6f4af297d2114d3a237d33172f1f (patch) | |
tree | bbcbe9dedb6724894364f09a78c74c1e58280b3d /src/feature/hs/hs_cache.c | |
parent | 045db909c2128b11b3ea02fadd0d1fce974e32e7 (diff) | |
parent | 04b0263974c7ad1327e7a193884cf31d55f7949a (diff) | |
download | tor-1bdccc03a94c6f4af297d2114d3a237d33172f1f.tar.gz tor-1bdccc03a94c6f4af297d2114d3a237d33172f1f.zip |
Merge branch 'tor-gitlab/mr/254' into maint-0.3.5
Diffstat (limited to 'src/feature/hs/hs_cache.c')
-rw-r--r-- | src/feature/hs/hs_cache.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c index 05f9940ae6..042ec55fa4 100644 --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@ -17,6 +17,7 @@ #include "feature/hs/hs_common.h" #include "feature/hs/hs_client.h" #include "feature/hs/hs_descriptor.h" +#include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" #include "feature/rend/rendcache.h" @@ -673,7 +674,9 @@ cached_client_descriptor_has_expired(time_t now, /* We use the current consensus time to see if we should expire this * descriptor since we use consensus time for all other parts of the protocol * as well (e.g. to build the blinded key and compute time periods). */ - const networkstatus_t *ns = networkstatus_get_live_consensus(now); + const networkstatus_t *ns = + networkstatus_get_reasonably_live_consensus(now, + usable_consensus_flavor()); /* If we don't have a recent consensus, consider this entry expired since we * will want to fetch a new HS desc when we get a live consensus. */ if (!ns) { |