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

[nickm at torproject.org]

commit e343cb8f631dbbad2fbe9814d558ac06bc46a8e8
Merge: 1bd83c2ec e2d8300c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 20 14:25:17 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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