commit 20ca62ffb5dd3640c7d3054612c158c08d8ee677 Merge: 9cb1c2b4a 461e34bb3 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 1 12:13:39 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

changes/bug24480 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)