commit 8e690ce736b3c61a1f007df4a1cd542e97e602c5 Merge: 0a38e02fb3 dcc60294ad Author: Alexander Færøy ahf@torproject.org Date: Wed Jul 29 13:57:47 2020 +0000

Merge remote-tracking branch 'tor-gitlab/mr/85' into maint-0.4.4

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