aboutsummaryrefslogtreecommitdiff
path: root/src/or/include.am
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2013-05-10 19:39:48 -0700
committerAndrea Shepard <andrea@torproject.org>2013-05-10 19:39:48 -0700
commitaaa3a085db05c4d98b7c51b5ef16da166e7c7f0a (patch)
treeb5b7a62362aac37bcbf237548de19f467d88805b /src/or/include.am
parentbae5dd6c8d4535360d471932b87431f54b515567 (diff)
parent54f41d68e9e30ccd0ebd84a3f8e913ea9e923cfd (diff)
downloadtor-aaa3a085db05c4d98b7c51b5ef16da166e7c7f0a.tar
tor-aaa3a085db05c4d98b7c51b5ef16da166e7c7f0a.tar.gz
Merge bug5595-v2-squashed into maint-0.2.4
Diffstat (limited to 'src/or/include.am')
-rw-r--r--src/or/include.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/include.am b/src/or/include.am
index d2be1fb1e..65dbeff53 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -45,6 +45,7 @@ src_or_libtor_a_SOURCES = \
src/or/dirvote.c \
src/or/dns.c \
src/or/dnsserv.c \
+ src/or/fp_pair.c \
src/or/geoip.c \
src/or/entrynodes.c \
src/or/hibernate.c \
@@ -126,6 +127,7 @@ ORHEADERS = \
src/or/dns.h \
src/or/dnsserv.h \
src/or/eventdns_tor.h \
+ src/or/fp_pair.h \
src/or/geoip.h \
src/or/entrynodes.h \
src/or/hibernate.h \