[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5

[nickm at torproject.org]

commit 0c0214bcc08e85040e8eb12f8388a45d271a6918
Merge: 6a43aadec 88489cd29
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 29 12:55:27 2020 -0400

    Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5

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