]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d08d29f 3c97ab3)
Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:54:37 +0000 (12:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:54:37 +0000 (12:54 -0400)
1  2 
src/core/or/channeltls.c patch | diff1 | diff2 | blob | history

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