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

Merge branch 'maint-0.4.4' into release-0.4.4

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