Commit abde2982 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.2' into maint-0.3.3

parents a639a678 394f102e

changes/bug25761

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Major bugfixes (onion service):

    - Correctly detect when onion services get disabled after HUP.

      Fixes bug 25761; bugfix on 0.3.2.1.

src/or/hs_service.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

src/or/rendservice.c

+3 −2
Original line number Diff line number Diff line
@@ -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