Merge branch 'ed25519_ref10_squashed'

Conflicts:
	src/common/include.am
	src/ext/README
This commit is contained in:
Nick Mathewson
2014-09-25 15:11:34 -04:00
96 changed files with 7104 additions and 46 deletions
+2 -1
View File
@@ -74,7 +74,8 @@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \
noinst_HEADERS+= \
src/test/test.h \
src/test/test_descriptors.inc
src/test/test_descriptors.inc \
src/test/ed25519_vectors.inc
if CURVE25519_ENABLED
noinst_PROGRAMS+= src/test/test-ntor-cl