]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Mon, 22 Dec 2014 21:02:47 +0000 (16:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 22 Dec 2014 21:02:47 +0000 (16:02 -0500)
1  2 
src/common/crypto.c
src/common/util.c

Simple merge
Simple merge