commit beffad8529c9b603bcf6b6e720747f6210c5c25c Merge: 0d78fbb718 faf89ec6c2 Author: David Goulet dgoulet@torproject.org Date: Tue Sep 22 13:47:08 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.3

changes/ticket40135 | 3 +++ src/feature/hs_common/shared_random_client.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-)