commit a6a0c7a4ecc22a744b123a47d466963f6023a11f Merge: 831d3b794 75509dc82 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 30 12:05:59 2017 -0500

Merge branch 'trove-2017-009_025' into maint-0.2.5

changes/trove-2017-009 | 10 ++++++++++ src/or/rendservice.c | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-)