]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug19152_024_v2' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 13:26:45 +0000 (09:26 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 13:26:45 +0000 (09:26 -0400)
1  2 
src/common/crypto.c

Simple merge