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

[nickm at torproject.org]

commit 834e1f8085af43c8f7bd07c346cf6f760a519f13
Merge: 109cfebca b9f849bde
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 4 12:30:51 2017 -0400

    Merge remote-tracking branch 'asn/bug23346'

 src/or/hs_service.c       |  36 ++++++-------
 src/or/hs_service.h       |   2 +-
 src/test/test_hs_common.c | 134 +++++++++++++++++++++++++---------------------
 3 files changed, 90 insertions(+), 82 deletions(-)