commit 7e50d43f07180c13adbeb0a9f1394490f3c679bb parent a7ea639f12d9a18c76c8a1c4e7eb00e75887a34d Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 16 Aug 2018 08:37:11 -0400 Merge branch 'maint-0.3.4' Diffstat:
| A | changes/bug26932 | | | 4 | ++++ |
| M | src/feature/hs/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/feature/hs/hs_service.c b/src/feature/hs/hs_service.c @@ -892,6 +892,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 */ }