commit 17e67dce81aef4d701b2be2cd557882c6b302b9a Merge: ee2e3e852 23c4592ee Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 18 09:40:41 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

changes/trove-2017-008 | 5 +++++ src/or/rendservice.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)