commit 6abdc77c3ad708d205528f60e4bd112e498c077e Merge: 47e87f2be 953a8f851 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Dec 1 12:13:40 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)