]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7259e3f f6a776d)
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Thu, 17 Jul 2014 09:34:33 +0000 (11:34 +0200)
committerNick Mathewson <nickm@torproject.org>
Thu, 17 Jul 2014 09:34:33 +0000 (11:34 +0200)
1  2 
src/common/tortls.c patch | diff1 | diff2 | blob | history

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