diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:12:01 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:12:01 -0500 |
| commit | 1887231afb377dbd2b68b815c354db492c515e08 (patch) | |
| tree | 5e0821e665d23d58879b22e9554bbf4cd9df9006 /src/core | |
| parent | ed0fcfd2b8804e639fc859b7e63e57d7e52747f5 (diff) | |
| parent | b3652f2104c880bf626cb4e97e6088bca5a1571f (diff) | |
| download | tor-1887231afb377dbd2b68b815c354db492c515e08.tar.gz tor-1887231afb377dbd2b68b815c354db492c515e08.zip | |
Merge branch 'tor-gitlab/mr/256' into maint-0.4.4
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 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; } |