commit 7fff6cfead76263c0ced736996dd7ed35e95a6f4 Merge: 0576f9f a155035 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 27 17:19:08 2017 -0400

Merge branch 'asn_bug22006_final_squashed'

changes/bug22006 | 4 ++ src/common/crypto_ed25519.c | 50 +++++++++++++++++++++++ src/common/crypto_ed25519.h | 2 + src/ext/ed25519/donna/ed25519_donna_tor.h | 5 +++ src/ext/ed25519/donna/ed25519_tor.c | 27 +++++++++++++ src/ext/ed25519/ref10/blinding.c | 37 +++++++++++++++++ src/ext/ed25519/ref10/ed25519_ref10.h | 4 ++ src/or/dirserv.c | 16 +++++++- src/test/ed25519_exts_ref.py | 30 ++++++++++++++ src/test/test_crypto.c | 66 +++++++++++++++++++++++++++++++ 10 files changed, 239 insertions(+), 2 deletions(-)