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

[teor at torproject.org]

commit 4f9a0033920b21882c4b6eead3c55551826ee8e9
Merge: 63aff4a43 9b73088c1
Author: teor <teor at torproject.org>
Date:   Wed Nov 6 11:19:13 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1

 changes/bug31897     | 3 +++
 src/test/test_util.c | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)