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

[nickm at torproject.org]

commit 296e429ebcb676b39a574bf8e8850c53bb659d74
Merge: f0f2fab5e a0cc7e949
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 05:36:06 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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