[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[nickm at torproject.org]

commit b31086201178c954e4d300273bbc7c7f5d4d6a8a
Merge: 9c217cd47 0c0214bcc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 29 12:55:35 2020 -0400

    Merge branch 'maint-0.3.5' into release-0.3.5

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