commit 23c4592ee98df59ccfe1a31bf714809caa78ca98 Merge: 49b5ad6b7 139bda4fe Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 18 09:40:40 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

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