commit 5f4601f5aa388f25c63faf9822f7dfcfab09f34c Merge: 061fcce5d5 cdb0e6c252 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 29 12:37:07 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

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