mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.3.2' into maint-0.3.3

Browse source
This commit is contained in:
Nick Mathewson 2018-08-16 08:37:11 -04:00
commit 936e2aa0de
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug26932 Normal file
View file

@ -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.

1
src/or/hs_service.c
View file

@ -854,6 +854,7 @@ move_hs_state(hs_service_t *src_service, hs_service_t *dst_service)
replaycache_free(dst->replay_cache_rend_cookie); replaycache_free(dst->replay_cache_rend_cookie);
} }
dst->replay_cache_rend_cookie = src->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 */ src->replay_cache_rend_cookie = NULL; /* steal pointer reference */
} }