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

[nickm at torproject.org]

commit 3cf8da02f7e74334e17b84a77be1a0bacc77def1
Merge: 5ef656e7d e94f68e30
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 28 15:49:11 2017 -0400

    Merge remote-tracking branch 'asn/bug23343'

 src/or/hs_common.c        | 17 ++++++++---------
 src/test/test_hs_common.c | 23 +++++++++++++++++------
 2 files changed, 25 insertions(+), 15 deletions(-)