commit 75b544d64da0e273090d2f7ff98a67c9267cc37d Merge: 2f397236b a0cc7e949 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 19 05:36:06 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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