Merge branch 'bug23331_032_01_squashed'

This commit is contained in:
Nick Mathewson 2017-09-05 08:24:28 -04:00
commit 56df123933

View file

@ -2110,7 +2110,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()) {
if (!have_completed_a_circuit() || net_is_disabled() ||
networkstatus_get_live_consensus(now) == NULL) {
goto end;
}