commit 69238ca2da923c8a50d5c1007f3e702eea163b50 Merge: 34601105a c985940de Author: Nick Mathewson nickm@torproject.org Date: Sun Feb 24 17:17:16 2019 -0500

Merge remote-tracking branch 'tor-github/pr/646'

changes/ticket25417 | 4 ++++ src/feature/control/control.c | 26 ++++++++++++++++++++------ src/feature/hs/hs_client.c | 18 ++++++++++++++++++ src/feature/hs/hs_client.h | 4 ++++ src/feature/hs/hs_control.c | 14 ++++++++++++++ src/feature/hs/hs_control.h | 4 ++++ 6 files changed, 64 insertions(+), 6 deletions(-)