]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b0b850 33d9889)
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
authorNick Mathewson <nickm@torproject.org>
Wed, 31 Jan 2018 21:17:04 +0000 (16:17 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 31 Jan 2018 21:17:04 +0000 (16:17 -0500)
1  2 
src/or/channeltls.c patch | diff1 | diff2 | blob | history

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