aboutsummaryrefslogtreecommitdiff
path: root/src/feature/hs/hs_cache.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-01-28 12:11:33 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-01-28 12:11:33 -0500
commit5c89197c9f197f39d18872e508635cd4864566aa (patch)
tree3702fc92ed2d4e0cc9e8df35bc709121fc49cabb /src/feature/hs/hs_cache.c
parent6186288eb639e7600c9d7ab482135d44ed78fe21 (diff)
parent0485c7ddba8c3474d1be8972caa9505b09d65644 (diff)
downloadtor-5c89197c9f197f39d18872e508635cd4864566aa.tar.gz
tor-5c89197c9f197f39d18872e508635cd4864566aa.zip
Merge branch 'tor-gitlab/mr/255' into maint-0.4.3
Diffstat (limited to 'src/feature/hs/hs_cache.c')
-rw-r--r--src/feature/hs/hs_cache.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c
index 44cd2505fd..ef5e88e947 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"
@@ -739,7 +740,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) {