]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 13:27:47 +0000 (09:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 13:27:47 +0000 (09:27 -0400)
1  2 
src/common/crypto.c
src/common/memarea.c

Simple merge
Simple merge