]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/85' into maint-0.4.4
authorAlexander Færøy <ahf@torproject.org>
Wed, 29 Jul 2020 13:57:47 +0000 (13:57 +0000)
committerAlexander Færøy <ahf@torproject.org>
Wed, 29 Jul 2020 13:57:47 +0000 (13:57 +0000)
1  2 
src/lib/fdio/fdio.c

Simple merge