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

[nickm at torproject.org]

commit 9068e55ce8c11c6500b44347fb9159bb5a8ef8bf
Merge: 729f9a286 e2d8300c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 20 14:25:17 2017 -0500

    Merge branch 'maint-0.3.2'

 changes/bug23783 | 5 +++++
 configure.ac     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)