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

[nickm at torproject.org]

commit 4700ba6c3d67056fc271cd2355fc956c182af7ad
Merge: 8b536ca59 652d22e60
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 31 12:19:42 2017 -0400

    Merge branch '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(-)