commit 50f5f0001c386c3e98ffb9bee72d00719039c0e1 Merge: 09c35dcf03 dcc60294ad Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 29 12:37:07 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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