commit 51b4a4bd1c0114a95336afc96d4208101872dba9 Merge: fadea75ad fd8ce812b Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 29 12:55:35 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

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