[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm at torproject.org]

commit 31e69ac22278e381c4f46851d1977f6760089a12
Merge: 3abd57fa0 9187cdb1c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 10:37:36 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

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