]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb72365 e6965f7)
Merge branch 'maint-0.2.6' into maint-0.2.7
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 13:55:07 +0000 (08:55 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 13:55:07 +0000 (08:55 -0500)
1  2 
src/common/crypto.c patch | diff1 | diff2 | blob | history

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