diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-09 11:53:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-09 11:53:18 -0400 |
| commit | abde29824ceb76bd21e728260796ecb4ff55151a (patch) | |
| tree | 8f4ff9db2069dc4b7883c556b33ffdc533221e43 /src | |
| parent | a639a67844909bd05fadaea5c1847f5e9af55cde (diff) | |
| parent | 394f102ea6b0494cde97769a99d75e91b5743616 (diff) | |
| download | tor-abde29824ceb76bd21e728260796ecb4ff55151a.tar.gz tor-abde29824ceb76bd21e728260796ecb4ff55151a.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/hs_service.c | 5 | ||||
| -rw-r--r-- | src/or/rendservice.c | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 7df8027882..c31f8bbf68 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -861,11 +861,6 @@ register_all_services(void) tor_assert(hs_service_staging_list); - /* We'll save us some allocation and computing time. */ - if (smartlist_len(hs_service_staging_list) == 0) { - return; - } - /* Allocate a new map that will replace the current one. */ new_service_map = tor_malloc_zero(sizeof(*new_service_map)); HT_INIT(hs_service_ht, new_service_map); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index cc22429777..bfe8a14f5b 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -618,10 +618,11 @@ void rend_service_prune_list(void) { smartlist_t *old_service_list = rend_service_list; - /* Don't try to prune anything if we have no staging list. */ + if (!rend_service_staging_list) { - return; + rend_service_staging_list = smartlist_new(); } + rend_service_prune_list_impl_(); if (old_service_list) { /* Every remaining service in the old list have been removed from the |