commit eba2870d18116bcce331421630fd9f8b47aa7f67 Merge: 6665713967 8e690ce736 Author: Alexander Færøy ahf@torproject.org Date: Wed Jul 29 13:58:14 2020 +0000

Merge branch 'maint-0.4.4'

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