]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91413e0 2ed194c)
Merge branch 'maint-0.4.2'
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 18:47:28 +0000 (14:47 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 18:47:28 +0000 (14:47 -0400)
1  2 
src/core/mainloop/mainloop.c patch | diff1 | diff2 | blob | history

diff --cc src/core/mainloop/mainloop.c
Simple merge
Mirror of https://git.torproject.org/tor.git