[tor-commits] [tor/maint-0.2.8] Merge branch 'trove-2017-008_028' into maint-0.2.8

[nickm at torproject.org]

commit 0ec72b030839c3a9e8c557483594b9dbe86c0792
Merge: 26f68dfce 4a2cbea6c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 09:39:35 2017 -0400

    Merge branch 'trove-2017-008_028' into maint-0.2.8

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