]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Mon, 22 Dec 2014 20:58:49 +0000 (15:58 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 22 Dec 2014 20:58:49 +0000 (15:58 -0500)
1  2 
src/common/crypto.c
src/common/util.c

Simple merge
Simple merge