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

[nickm at torproject.org]

commit 2264172fb32134c6c2fb0dab67229c820696ccb5
Merge: 926914a09 0307e7e0e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 8 12:09:02 2017 -0400

    Merge remote-tracking branch 'asn/bug23387_squashed'

 scripts/maint/checkSpace.pl |    2 +-
 src/or/hs_client.c          |   15 +-
 src/or/hs_client.h          |    7 +
 src/or/hs_common.c          |  153 +++++--
 src/or/hs_common.h          |   20 +-
 src/or/hs_descriptor.h      |    7 +-
 src/or/hs_service.c         |  263 ++++++-----
 src/or/hs_service.h         |   14 +-
 src/or/nodelist.c           |   85 ++--
 src/or/nodelist.h           |   11 +
 src/test/test_hs_common.c   | 1045 ++++++++++++++++++++++++++++++++++++++-----
 src/test/test_hs_service.c  |  221 +++++----
 12 files changed, 1432 insertions(+), 411 deletions(-)