commit 401e70fba2199a2ca4f243e936a4506d37314032 Merge: 4953efec3 a2aaf9509 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 19 16:30:53 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug24895 | 8 ++++++++ src/or/rendservice.c | 29 ++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 5 deletions(-)