[tor-commits] [tor/maint-0.3.1] Merge branch 'trove-2017-008_030' into maint-0.3.0

[nickm at torproject.org]

commit 9d8d4cb3fa3e678955b30dc9ff8d01b3f54d805d
Merge: 7df790890 09ea89764
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 09:40:36 2017 -0400

    Merge branch 'trove-2017-008_030' into maint-0.3.0

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