aboutsummaryrefslogtreecommitdiff
path: root/src/core/mainloop/mainloop.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/core/mainloop/mainloop.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/core/mainloop/mainloop.c')
-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 260de181e5..acace9a7de 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -2155,7 +2155,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;
}