]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97c9ced 2420e84)
Merge branch 'maint-0.3.4' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Fri, 21 Dec 2018 20:42:57 +0000 (15:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 21 Dec 2018 20:42:57 +0000 (15:42 -0500)
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