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

[dgoulet at torproject.org]

commit 2e8eb1d5e32cc5849fc0676b5fa92b1606f2cae5
Merge: eb00eff09 0c346bdd6
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu May 3 09:33:42 2018 -0400

    Merge remote-tracking branch 'asn/bug23107'

 changes/bug23107    |  6 ++++++
 src/or/hs_circuit.c | 19 ++++---------------
 src/or/hs_service.c |  4 ++++
 src/or/hs_service.h |  3 +++
 4 files changed, 17 insertions(+), 15 deletions(-)