commit a0f8c010049f8d0fee375041948287cd65bef12a Merge: 4af1653e0 e598c6f6d Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 27 08:05:04 2017 -0400

Merge branch 'maint-0.3.2'

changes/bug24002 | 5 +++++ src/or/hs_service.c | 4 ++++ 2 files changed, 9 insertions(+)