commit bf1635d8cf292b5d589e991a92a3c8f09ec32e51 Merge: c8a7b7b58 38599de2d Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 16 08:04:34 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/ticket27810 | 5 +++++ src/test/test_hs_service.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)