tor

commit 936e2aa0de6edb0578e18ad0760a67ad64a448d4
parent 4847e221689f702f74d6dd15181216aeabbb6785
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 16 Aug 2018 08:37:11 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

Diffstat:
A
changes/bug26932
 | 
4
++++
M
src/or/hs_service.c
 | 
1
+

2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/changes/bug26932 b/changes/bug26932
@@ -0,0 +1,3 @@
+  o Minor bugfixes (onion services):
+    - Fix bug that causes services to not ever rotate their descriptors if they
+      were getting SIGHUPed often. Fixes bug 26932; bugfix on 0.3.2.1-alpha.
+\ No newline at end of file
diff --git a/src/or/hs_service.c b/src/or/hs_service.c
@@ -854,6 +854,7 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service)
     replaycache_free(dst->replay_cache_rend_cookie);
   }
   dst->replay_cache_rend_cookie = src->replay_cache_rend_cookie;
+  dst->next_rotation_time = src->next_rotation_time;
 
   src->replay_cache_rend_cookie = NULL; /* steal pointer reference */
 }