aboutsummaryrefslogtreecommitdiff
path: root/src/core/mainloop
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-01-12 10:55:21 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-01-12 10:55:21 -0500
commit9b59ede8d342a11d7949a4793b7d456de2a3ff5d (patch)
treeefa10799bb4d2778b73a82358d9039a48bed1524 /src/core/mainloop
parentd1f474160638e10478a2ab14fb93b1e8b6a720a2 (diff)
parentb3652f2104c880bf626cb4e97e6088bca5a1571f (diff)
downloadtor-9b59ede8d342a11d7949a4793b7d456de2a3ff5d.tar.gz
tor-9b59ede8d342a11d7949a4793b7d456de2a3ff5d.zip
Merge branch 'ticket40237_044_01' into ticket40237_045_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 6abfe0ff39..77ab6f26c8 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -2151,7 +2151,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;
}