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

[nickm at torproject.org]

commit 7e7b052b2a114900b5e6575fd5375dc00c09d5db
Merge: 6182f60f7 9187cdb1c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 10:37:36 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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