summaryrefslogtreecommitdiff
path: root/src/or/rendservice.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-09 11:53:18 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-09 11:53:18 -0400
commitabde29824ceb76bd21e728260796ecb4ff55151a (patch)
tree8f4ff9db2069dc4b7883c556b33ffdc533221e43 /src/or/rendservice.c
parenta639a67844909bd05fadaea5c1847f5e9af55cde (diff)
parent394f102ea6b0494cde97769a99d75e91b5743616 (diff)
downloadtor-abde29824ceb76bd21e728260796ecb4ff55151a.tar.gz
tor-abde29824ceb76bd21e728260796ecb4ff55151a.zip
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src/or/rendservice.c')
-rw-r--r--src/or/rendservice.c5
1 files changed, 3 insertions, 2 deletions
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