[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm at torproject.org]

commit 7cab15eabc9eebaf4e26bcfb7016ac19c8bc1a7e
Merge: 8d34a6ea9 0ec72b030
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 09:40:40 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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