[tor-commits] [tor/maint-0.3.2] Detect when v3 services get disabled after HUP.

[nickm at torproject.org]

commit 7e8c5e36622d4581840bb0a037a66d9504c433a5
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue May 8 18:14:02 2018 +0300

    Detect when v3 services get disabled after HUP.
    
    Remove v3 optimization which made Tor not detect disabling services.
    
    This optimization is not so needed because we only call that function after HUP
    anyway.
    
    Fixes bug #25761.
---
 changes/bug25761    | 3 +++
 src/or/hs_service.c | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/changes/bug25761 b/changes/bug25761
new file mode 100644
index 000000000..096fadcf0
--- /dev/null
+++ b/changes/bug25761
@@ -0,0 +1,3 @@
+  o Major bugfixes (onion service):
+    - Correctly detect when onion services get disabled after HUP.
+      Fixes bug 25761; bugfix on 0.3.2.1.
diff --git a/src/or/hs_service.c b/src/or/hs_service.c
index 8ddd68c69..b9a1dfc36 100644
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@ -859,11 +859,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);