[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2

[nickm at torproject.org]

commit 0cb89eb828005ccf4b1ae72988b9c3b958ceade4
Merge: db5aa54a4 2ac9734bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 16 13:35:52 2018 -0500

    Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2

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