]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote branch 'public/rand_double2'
authorNick Mathewson <nickm@torproject.org>
Tue, 29 Jun 2010 22:57:59 +0000 (18:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 29 Jun 2010 22:57:59 +0000 (18:57 -0400)
1  2 
src/common/crypto.c
src/or/circuitbuild.c

Simple merge
Simple merge