]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5
authorteor <teor@torproject.org>
Wed, 15 Jan 2020 23:57:27 +0000 (09:57 +1000)
committerteor <teor@torproject.org>
Wed, 15 Jan 2020 23:57:27 +0000 (09:57 +1000)
1  2 
src/core/mainloop/mainloop.c

Simple merge