diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-25 15:11:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-25 15:11:34 -0400 |
| commit | 1c5d680b3d6734e989a92deedbcf2bb46f31f7f9 (patch) | |
| tree | 9095ef06917bd77ce7581560de56872ef8f8ead7 /src/test/include.am | |
| parent | 50d15e06b32ce743ac4da532f29abb3781c4b990 (diff) | |
| parent | 46cda485bce60894d3128dcd42831a8c6cc7bcb4 (diff) | |
| download | tor-1c5d680b3d6734e989a92deedbcf2bb46f31f7f9.tar.gz tor-1c5d680b3d6734e989a92deedbcf2bb46f31f7f9.zip | |
Merge branch 'ed25519_ref10_squashed'
Conflicts:
src/common/include.am
src/ext/README
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am index db9f2d1f1f..5f88189222 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -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 |