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

[nickm at torproject.org]

commit 7ec17188fe51298912db50e2f7c14886b1b7f3d6
Merge: 7ffef14 552bc39
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 7 08:08:17 2017 -0500

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug21594     |  5 +++++
 src/or/rendservice.c | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)