]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc2cd0f a12c5f4)
Merge branch 'feature17796_squashed'
authorNick Mathewson <nickm@torproject.org>
Tue, 29 Dec 2015 14:48:39 +0000 (09:48 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 29 Dec 2015 14:48:39 +0000 (09:48 -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