[tor-commits] [tor/master] Merge branch 'tor-github/pr/1563'

[dgoulet at torproject.org]

commit 65759f29019ed4cd33502fef9b06bb92aa6e348a
Merge: df6c5382a 12305b6bb
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Dec 3 09:22:21 2019 -0500

    Merge branch 'tor-github/pr/1563'

 src/feature/control/control_hs.c |  18 +--
 src/feature/hs/hs_client.c       | 296 +++++++++++++++++++++++++++++++--------
 src/feature/hs/hs_client.h       |   8 +-
 src/test/test_hs_control.c       | 181 +++++++++++++++++++++++-
 4 files changed, 422 insertions(+), 81 deletions(-)