diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:10:39 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:10:39 -0500 |
| commit | 1bdccc03a94c6f4af297d2114d3a237d33172f1f (patch) | |
| tree | bbcbe9dedb6724894364f09a78c74c1e58280b3d /src/core | |
| parent | 045db909c2128b11b3ea02fadd0d1fce974e32e7 (diff) | |
| parent | 04b0263974c7ad1327e7a193884cf31d55f7949a (diff) | |
| download | tor-1bdccc03a94c6f4af297d2114d3a237d33172f1f.tar.gz tor-1bdccc03a94c6f4af297d2114d3a237d33172f1f.zip | |
Merge branch 'tor-gitlab/mr/254' into maint-0.3.5
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/mainloop/mainloop.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index f0aa37e8da..e67e1299b2 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -2511,7 +2511,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; } |