commit 47fab50cbaf3a41e8af9c63f645ad6075b43e565 Merge: ff8fe38 b7eab94 Author: Nick Mathewson nickm@torproject.org Date: Sun Sep 28 21:01:14 2014 -0400

Merge branch 'bug13280'

src/ext/ed25519/ref10/crypto_int32.h | 22 ++++ src/ext/ed25519/ref10/crypto_int64.h | 20 ++++ src/ext/ed25519/ref10/fe_frombytes.c | 20 ++-- src/ext/ed25519/ref10/fe_mul.c | 24 ++--- src/ext/ed25519/ref10/fe_sq.c | 24 ++--- src/ext/ed25519/ref10/fe_sq2.c | 24 ++--- src/ext/ed25519/ref10/fe_tobytes.c | 36 +++---- src/ext/ed25519/ref10/ge_scalarmult_base.c | 4 +- src/ext/ed25519/ref10/sc_muladd.c | 158 ++++++++++++++-------------- src/ext/ed25519/ref10/sc_reduce.c | 112 ++++++++++---------- 10 files changed, 243 insertions(+), 201 deletions(-)