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

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