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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.2'

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