]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98e1472 ceb6585)
Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:25:55 +0000 (08:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:25:55 +0000 (08:25 -0400)
1  2 
src/core/mainloop/connection.c patch | diff1 | diff2 | blob | history

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