[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1427' into maint-0.4.2

[nickm at torproject.org]

commit f0f3f3338e220f773b4921215f3c9955f5601a7c
Merge: 0994050c4 b3fc3b609
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 18 12:42:49 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1427' into maint-0.4.2

 changes/bug32124 |  7 +++++++
 configure.ac     | 17 ++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)