]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.4.2'
authorteor <teor@torproject.org>
Thu, 7 Nov 2019 00:51:48 +0000 (10:51 +1000)
committerteor <teor@torproject.org>
Thu, 7 Nov 2019 00:51:48 +0000 (10:51 +1000)
1  2 
src/core/mainloop/mainloop.c
src/lib/evloop/compat_libevent.c

Simple merge
Simple merge