]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug20553_028'
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2016 14:52:21 +0000 (10:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2016 14:52:21 +0000 (10:52 -0400)
1  2 
src/common/crypto.c
src/tools/tor-gencert.c

Simple merge
Simple merge