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

[nickm at torproject.org]

commit bcea98a4b41f7e54068ad73f50eb5e0ceb593a12
Merge: 4e5e97342 296e429eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 05:36:06 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug25450           |  8 ++++++++
 src/test/test_hs_service.c | 11 ++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)