diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-25 12:03:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-25 12:03:41 -0400 |
| commit | 764e0080929fe2e0fc05a226d340a189d264876b (patch) | |
| tree | 21dc878bf63eae8304fc587a166f129201e584f3 /src/test/include.am | |
| parent | ecab2616413b06754bfb110eab2bfbf58e3a57b2 (diff) | |
| parent | c4337367341f0542a13990c55f0c6cdeca203659 (diff) | |
| download | tor-764e0080929fe2e0fc05a226d340a189d264876b.tar.gz tor-764e0080929fe2e0fc05a226d340a189d264876b.zip | |
Merge branch 'libscrypt_trunnel_squashed'
Conflicts:
src/test/test_crypto.c
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am index 77c92f12f8..db9f2d1f1f 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -60,7 +60,7 @@ src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ src/common/libor-crypto-testing.a $(LIBDONNA) \ - src/common/libor-event-testing.a \ + src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ |