]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/feature16794_more'
authorNick Mathewson <nickm@torproject.org>
Fri, 8 Jan 2016 22:54:51 +0000 (14:54 -0800)
committerNick Mathewson <nickm@torproject.org>
Fri, 8 Jan 2016 22:54:51 +0000 (14:54 -0800)
1  2 
src/common/crypto.c
src/common/crypto.h

Simple merge
Simple merge