]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca03b10 732f522)
Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Mon, 23 Mar 2015 13:25:15 +0000 (09:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 23 Mar 2015 13:25:15 +0000 (09:25 -0400)
1  2 
src/ext/csiphash.c patch | diff1 | diff2 | blob | history

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