[tor-commits] [tor/master] Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2

[nickm at torproject.org]

commit a0cc7e9492ca3737d197d5b7ec491f6f00bc9fb5
Merge: d60dc2755 9191d962f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 05:35:39 2018 -0400

    Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2

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