commit cf5ab5934e80c6c04825d9db83329627fe6b9729 Merge: 4c54021ba b6fd78ea3 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 12 09:32:24 2017 -0500

Merge remote-tracking branch 'dgoulet/bug24595_032_02' into maint-0.3.2

src/or/hs_service.c | 50 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 17 deletions(-)