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

[nickm at torproject.org]

commit 19421ffcf3fef22bd221279afceb137354d0a3bf
Merge: f5f4a6861 910422e8f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 16:59:49 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 src/test/test_hs_service.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)