commit cef910642efb1f9a2db16146eb8a191327b51310 Merge: df1a8a657 b69d28ae8 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 11 18:56:57 2019 -0500

Merge branch 'bug28989_squashed'

changes/bug28989 | 5 +++++ src/test/test_hs_service.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-)