commit 060e0d0a7510564bf86a79612c219b0205028e9d Merge: 7bc9d1e 62c5a1f Author: Nick Mathewson nickm@torproject.org Date: Mon May 16 08:26:11 2016 -0400

Merge branch 'crypto_unit_tests_v2_squashed'

changes/bug18956 | 5 + src/common/crypto.c | 159 ++++++++----- src/common/crypto.h | 1 + src/common/crypto_curve25519.c | 9 +- src/common/crypto_ed25519.c | 9 +- src/common/crypto_pwbox.c | 28 ++- src/common/crypto_s2k.c | 2 +- src/test/test_crypto.c | 525 ++++++++++++++++++++++++++++++++++++++++- src/test/test_ntor_cl.c | 5 +- 9 files changed, 663 insertions(+), 80 deletions(-)