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

commit 910422e8fae173f061d016c72eecc2015a09537e Merge: 85719b79b 66d312063 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 19 16:59:49 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_hs_service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)