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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.2' into maint-0.3.3

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