]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c78a314 8d5c0e5)
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Wed, 11 Jan 2012 16:07:13 +0000 (11:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 Jan 2012 16:07:13 +0000 (11:07 -0500)
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