[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug23457_032_01'

commit 6c5c74e11e63f8e1a924ac8de4784edaf56179fa Merge: 26d462c1f 7150214ba Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 12 11:10:48 2017 -0400

Merge remote-tracking branch 'asn/bug23457_032_01'

src/or/hs_client.c | 3 ++- src/or/hs_ident.c | 16 ++++++++++++++++ src/or/hs_ident.h | 8 ++++++++ src/or/hs_service.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 72 insertions(+), 2 deletions(-)