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

[nickm at torproject.org]

commit 777e828ef3d9f38d9684bc4f1d92e1af2460bfc2
Merge: a1f31c067 03b3f5486
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 25 09:24:36 2017 -0400

    Merge remote-tracking branch 'asn/ticket23420_032_01'

 changes/ticket23420        |   4 ++
 src/or/hs_circuit.c        |  15 +++++-
 src/or/hs_circuit.h        |  10 ++++
 src/or/hs_client.c         |   2 +-
 src/or/hs_client.h         |   3 ++
 src/or/hs_common.h         |   6 +++
 src/or/rendservice.c       |   2 +-
 src/test/test_hs_service.c | 131 ++++++++++++++++++++++++++++++++++++++++++++-
 8 files changed, 168 insertions(+), 5 deletions(-)