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

[nickm at torproject.org]

commit 3b8bf743ae6eca261dd46cde94371a4cca0c0689
Merge: 97d0cb83ed cdb0e6c252
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 29 12:37:07 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3

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