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

[nickm at torproject.org]

commit 24f7698320689e758d3bc7a8dac34988fc8a98b9
Merge: d3048a8f5 5c03bb7c0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 12:13:40 2017 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

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