summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-08-16 08:37:11 -0400
committerNick Mathewson <nickm@torproject.org>2018-08-16 08:37:11 -0400
commit936e2aa0de6edb0578e18ad0760a67ad64a448d4 (patch)
treecdf987e2e633f205126a1009bbd7a208d43d84e6 /src
parent4847e221689f702f74d6dd15181216aeabbb6785 (diff)
parentc798957b5925b637896bf162f58aca806235c2a5 (diff)
downloadtor-936e2aa0de6edb0578e18ad0760a67ad64a448d4.tar.gz
tor-936e2aa0de6edb0578e18ad0760a67ad64a448d4.zip
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src')
-rw-r--r--src/or/hs_service.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/hs_service.c b/src/or/hs_service.c
index 21daaaa248..e7abf715ad 100644
--- 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 */
}