]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83dfcfb db81565)
Merge branch 'maint-0.2.6' into maint-0.2.7
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Jan 2016 01:00:16 +0000 (20:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Jan 2016 01:00:16 +0000 (20:00 -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