[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit cf3da63b9023875e93c05d30fb6d76e047bebe70
Merge: 66e99096b b86c9acac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 12:13:40 2017 -0500

    Merge branch 'maint-0.3.2'

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