[tor-commits] [tor/master] Merge branch 'bug23672_032_01_squashed'

[nickm at torproject.org]

commit 1e7e36da4b6741235e77d97fff8446a6b7ba1300
Merge: 783a44b2c 6691af185
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 3 10:56:52 2017 -0400

    Merge branch 'bug23672_032_01_squashed'

 changes/bug23653          |   7 ++
 src/or/connection_edge.c  |   1 +
 src/or/hs_client.c        | 161 +++++++++++++++++++++++++++++++++++++++++++---
 src/or/hs_client.h        |   5 ++
 src/test/test_hs_client.c | 131 +++++++++++++++++++++++++++++++++++++
 5 files changed, 296 insertions(+), 9 deletions(-)