aboutsummaryrefslogtreecommitdiff
path: root/src/core/mainloop
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-01-12 10:54:31 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-01-12 10:54:31 -0500
commitb3652f2104c880bf626cb4e97e6088bca5a1571f (patch)
tree6cb537a2bc8f367f626f3dd728eb626d4041617d /src/core/mainloop
parent5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2 (diff)
parent0485c7ddba8c3474d1be8972caa9505b09d65644 (diff)
downloadtor-b3652f2104c880bf626cb4e97e6088bca5a1571f.tar.gz
tor-b3652f2104c880bf626cb4e97e6088bca5a1571f.zip
Merge branch 'ticket40237_043_01' into ticket40237_044_01
Diffstat (limited to 'src/core/mainloop')
-rw-r--r--src/core/mainloop/mainloop.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index e4e17f6b76..b4dbedbfe4 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -2154,7 +2154,8 @@ hs_service_callback(time_t now, const or_options_t *options)
/* We need to at least be able to build circuits and that we actually have
* a working network. */
if (!have_completed_a_circuit() || net_is_disabled() ||
- networkstatus_get_live_consensus(now) == NULL) {
+ !networkstatus_get_reasonably_live_consensus(now,
+ usable_consensus_flavor())) {
goto end;
}