]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2
authorteor <teor@torproject.org>
Thu, 7 Nov 2019 00:51:22 +0000 (10:51 +1000)
committerteor <teor@torproject.org>
Thu, 7 Nov 2019 00:51:22 +0000 (10:51 +1000)
1  2 
src/core/mainloop/mainloop.c

Simple merge