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

[nickm at torproject.org]

commit 7e1102ff25ae23d86afe3eacac890eb7743fac16
Merge: a1243864f 394f102ea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 9 11:53:18 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

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