[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2

[nickm at torproject.org]

commit 9187cdb1cd17dd988c6e444705c6153a65948f1e
Merge: d2951b381 b259008c5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 10:36:17 2018 -0400

    Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2

 changes/bug25901    | 3 +++
 src/or/hs_service.c | 4 ++++
 2 files changed, 7 insertions(+)