]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 155543d f998590)
Merge remote-tracking branch 'linus/bug5355_ln'
authorNick Mathewson <nickm@torproject.org>
Thu, 31 May 2012 16:33:16 +0000 (12:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 31 May 2012 16:33:16 +0000 (12:33 -0400)
1  2 
src/common/compat.c patch | diff1 | diff2 | blob | history

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