commit 109c555e9d70dca4c4106d6d9fa0dcebdf0ff7ad Merge: 36154c13f 66d312063 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 19 16:59:49 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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