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

[nickm at torproject.org]

commit d9bc1cdd1c65e2b533d7d64ccc5ecf140b34412f
Merge: 881307dc7 139bda4fe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 09:40:40 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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