commit 5c200d9be28ac9e53caac333ddd334539524d9e1 Merge: e0aa88d 303d7f5 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 23 21:28:42 2014 -0400

Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

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