commit a1019b82c1e26f0fb925bfc9ae55d213be579a90 Merge: 4c10a9c 6365859 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 8 14:54:51 2016 -0800

Merge remote-tracking branch 'public/feature16794_more'

changes/17926 | 3 ++ changes/bug16794_ed | 3 ++ src/common/crypto.c | 9 +++++- src/common/crypto.h | 4 +++ src/common/crypto_ed25519.c | 22 ++++++++++++++ src/common/crypto_ed25519.h | 5 +++ src/test/test_crypto.c | 71 ++++++++++++++++++++++++++++++++++++++----- 7 files changed, 108 insertions(+), 9 deletions(-)