[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

[nickm at torproject.org]

commit 97b8a25162cedccdc259cd793b20b06350ae5f46
Merge: 8b5b0c2bda 3b8bf743ae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 29 12:37:07 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

 changes/bug31036    | 3 +++
 src/lib/fdio/fdio.c | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)