]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c2c642 3d8b73d)
Merge branch 'block_renegotiate_024'
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Oct 2012 18:32:42 +0000 (14:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Oct 2012 18:32:42 +0000 (14:32 -0400)
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