diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-16 08:37:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-16 08:37:11 -0400 |
| commit | b49355915bf063448cf338fbb76061b601e5e333 (patch) | |
| tree | 699f02ba6a136657b7b0ef19688e396f74f98004 | |
| parent | 2deee972a37a8b36040f0f37091906b8dec61b25 (diff) | |
| parent | 936e2aa0de6edb0578e18ad0760a67ad64a448d4 (diff) | |
| download | tor-b49355915bf063448cf338fbb76061b601e5e333.tar.gz tor-b49355915bf063448cf338fbb76061b601e5e333.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
| -rw-r--r-- | changes/bug26932 | 3 | ||||
| -rw-r--r-- | src/or/hs_service.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug26932 b/changes/bug26932 new file mode 100644 index 0000000000..7d9481dcd3 --- /dev/null +++ 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 index eaf6d25120..bef6bb327d 100644 --- 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 */ } |