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

[nickm at torproject.org]

commit 67c62394bc0c8a1c7beb689908b968af454a828a
Merge: ae8683621 f28559fd2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 15 15:09:33 2017 -0500

    Merge branch 'bug24279_030' into maint-0.3.2

 changes/bug24279 | 4 ++++
 configure.ac     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)