[tor-commits] [tor/master] Merge branch 'bug23762_032_02_squashed' into maint-0.3.2

[nickm at torproject.org]

commit 3d93ec3ef418b13b1f8ae90436429e1941540f0f
Merge: 7c59c751b 5dbcd48f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 31 12:14:21 2017 -0400

    Merge branch 'bug23762_032_02_squashed' into maint-0.3.2

 changes/bug23762               |   4 +
 src/or/connection_edge.c       |   9 +-
 src/or/hs_client.c             | 181 ++++++++++++++++++++++++++++++-----------
 src/or/hs_client.h             |   1 +
 src/or/nodelist.c              |   2 +
 src/test/test_channelpadding.c |  12 ++-
 src/test/test_entryconn.c      |   5 +-
 7 files changed, 157 insertions(+), 57 deletions(-)