commit 303d7f55d9ec8c7dbd9784171cf4df97cc5d7eef Merge: 75501db ad0cf55 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 23 21:28:18 2014 -0400

Merge branch 'curve25519-donna32' into maint-0.2.4

changes/curve25519-donna32-bug | 12 ++ src/ext/curve25519_donna/curve25519-donna.c | 292 ++++++++++++++++++++------- 2 files changed, 228 insertions(+), 76 deletions(-)