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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3'

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