]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'asn/bug19555'
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:17:21 +0000 (12:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:17:21 +0000 (12:17 -0400)
1  2 
src/or/shared_random.c
src/or/shared_random_state.c

Simple merge
Simple merge