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

[nickm at torproject.org]

commit 7c61c437b34ea37fc22599f0aba5ed2551b6963f
Merge: dce1811cb 314652dc1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 09:40:40 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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