Merge branch 'maint-0.3.3' into maint-0.3.4

torproject · Aug 16, 2018 · b493559 · b493559
2 parents 2deee97 + 936e2aa
commit b493559
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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.
diff --git a/src/or/hs_service.c b/src/or/hs_service.c
@@ -871,6 +871,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 */
 }