[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit ea3c3a10a2567d44fae33f5814710e868c2a33bf
Merge: 9be7608fd 7e7b052b2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 10:37:36 2018 -0400

    Merge branch 'maint-0.3.3'

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