]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2
authorteor <teor@torproject.org>
Mon, 21 Oct 2019 03:07:39 +0000 (13:07 +1000)
committerteor <teor@torproject.org>
Mon, 21 Oct 2019 03:07:39 +0000 (13:07 +1000)
1  2 
src/core/mainloop/periodic.c

Simple merge