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

[nickm at torproject.org]

commit 5b32475fb0ee8c51cd5a032facbeec6c01434203
Merge: 0aff795b7 b06997914
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 20 12:55:46 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25306    |  6 ++++++
 src/or/hs_service.c | 32 ++++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)