]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Jun 2016 00:16:46 +0000 (20:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Jun 2016 00:16:46 +0000 (20:16 -0400)
1  2 
src/common/crypto.c
src/test/test_microdesc.c

Simple merge
Simple merge