diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-05 08:24:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-05 08:24:28 -0400 |
| commit | 56df12393304469e18e8417ae0781c164090522a (patch) | |
| tree | b91acdcfd69cf9c6bfc1d10c1f42c4fbc695c698 /src/or | |
| parent | 42394053c97c32786f1c5505bc9f8aa2d0ca253f (diff) | |
| parent | 9e900d1db7c8c9e164b5b14d5cdd4099c1ce45f0 (diff) | |
| download | tor-56df12393304469e18e8417ae0781c164090522a.tar.gz tor-56df12393304469e18e8417ae0781c164090522a.zip | |
Merge branch 'bug23331_032_01_squashed'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index a29fc315a2..7939f19845 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -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; } |