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

[nickm at torproject.org]

commit 7e96767825f2c6bd60c1c4beae98e5158b1bdc15
Merge: dbea64aab 0cb89eb82
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 16 13:35:55 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 Makefile.am      |  3 ++-
 changes/bug24652 |  6 ++++++
 configure.ac     | 11 +++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)