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

[nickm at torproject.org]

commit 33652fce623b926551617873bcaa686d335794b4
Merge: aed642a4b 27ea6fcd3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 2 10:26:30 2017 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/ticket24109 | 4 ++++
 src/test/include.am | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)