commit d07e069c97ac5f9e0c9a593b7ec84c540b310f0f Merge: b2b59b06c b39c50cde Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 19 16:30:53 2018 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug24895 | 8 ++++++++ src/or/rendservice.c | 26 ++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-)