commit fd8ce812b0a7263b75096207a735c02945320c86 Merge: 0f218a05a 0c0214bcc Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 29 12:55:35 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

changes/ticket28992 | 3 +++ src/feature/hs/hs_client.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)