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

[nickm at torproject.org]

commit 5c03bb7c0ca55a17dae64d4a9d05dd88b3d712c8
Merge: 7fae562a4 3bca705c5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 12:13:40 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/bug24480     | 3 +++
 src/or/rendservice.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)