]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4abfcb7 0650bf3)
Merge branch 'maint-0.2.9' into maint-0.3.5
authorteor <teor@torproject.org>
Wed, 6 Nov 2019 01:19:30 +0000 (11:19 +1000)
committerteor <teor@torproject.org>
Wed, 6 Nov 2019 01:19:30 +0000 (11:19 +1000)
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