diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-01-12 10:46:25 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-01-12 10:46:25 -0500 |
| commit | 60da5d62225c975842ef57195b7243baa7033acb (patch) | |
| tree | c355fe467bd86c209bc6f75c6eb5fec367fb0568 /src/feature/hs/hs_client.c | |
| parent | 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b (diff) | |
| parent | 04b0263974c7ad1327e7a193884cf31d55f7949a (diff) | |
| download | tor-60da5d62225c975842ef57195b7243baa7033acb.tar.gz tor-60da5d62225c975842ef57195b7243baa7033acb.zip | |
Merge branch 'ticket40237_035_01' into ticket40237_043_01
Diffstat (limited to 'src/feature/hs/hs_client.c')
| -rw-r--r-- | src/feature/hs/hs_client.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 68d6619cea..06b7f006ab 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -29,6 +29,7 @@ #include "feature/hs/hs_descriptor.h" #include "feature/hs/hs_ident.h" #include "feature/nodelist/describe.h" +#include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerset.h" @@ -1207,9 +1208,10 @@ can_client_refetch_desc(const ed25519_public_key_t *identity_pk, goto cannot; } - /* Without a live consensus we can't do any client actions. It is needed to - * compute the hashring for a service. */ - if (!networkstatus_get_live_consensus(approx_time())) { + /* Without a usable consensus we can't do any client actions. It is needed + * to compute the hashring for a service. */ + if (!networkstatus_get_reasonably_live_consensus(approx_time(), + usable_consensus_flavor())) { log_info(LD_REND, "Can't fetch descriptor for service %s because we " "are missing a live consensus. Stalling connection.", safe_str_client(ed25519_fmt(identity_pk))); |