commit 394f102ea6b0494cde97769a99d75e91b5743616 Merge: be5b4415c 7e8c5e366 Author: Nick Mathewson nickm@torproject.org Date: Wed May 9 11:53:15 2018 -0400

Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2

changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- src/or/rendservice.c | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-)