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

[nickm at torproject.org]

commit e2d8300c1060050dad9092e211c6753376b87ad6
Merge: 846df5b3c 1bf36c183
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 20 14:25:12 2017 -0500

    Merge branch 'bug23783' into maint-0.3.2

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