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

[nickm at torproject.org]

commit 094294dbb1e631d9b11ee8dbc3f70ccb9f290c54
Merge: 0026d1a67 53a807e1e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 13 13:41:11 2018 +0100

    Merge branch 'bug25474_032' into maint-0.3.2

 changes/bug25474 | 5 +++++
 configure.ac     | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)