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

[nickm at torproject.org]

commit cdb0e6c2522aac372c9a816300dacfd62856dd48
Merge: c0bc30b6f0 dcc60294ad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 29 12:37:07 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.2

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