]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'curve25519-donna32' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Thu, 24 Jul 2014 01:28:18 +0000 (21:28 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 24 Jul 2014 01:28:18 +0000 (21:28 -0400)

Trivial merge