aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-01-16 13:56:10 -0500
committerNick Mathewson <nickm@torproject.org>2013-01-16 13:56:10 -0500
commit65e6e68981d9910c5f78f2cfed6c59cbee1494c7 (patch)
treec4ac9df87c63144380a605327da0b37ea08fb1e1 /src/or
parent7fc91dc274f38dc50f2a6eef2db060c788ef3040 (diff)
parent50f527a2c9202105a84e5f6c7d2844c494a46b7d (diff)
downloadtor-65e6e68981d9910c5f78f2cfed6c59cbee1494c7.tar
tor-65e6e68981d9910c5f78f2cfed6c59cbee1494c7.tar.gz
Merge branch 'bug7972'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/include.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/include.am b/src/or/include.am
index 08a27e17b..241015488 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -99,7 +99,7 @@ src_or_tor_LDADD = src/or/libtor.a src/common/libor.a \
src/common/libor-crypto.a $(LIBDONNA) \
src/common/libor-event.a \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
- @TOR_LIB_WS32@ @TOR_LIB_GDI@
+ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
ORHEADERS = \
src/or/addressmap.h \