aboutsummaryrefslogtreecommitdiff
path: root/src/or/Makefile.nmake
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/Makefile.nmake
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/Makefile.nmake')
-rw-r--r--src/or/Makefile.nmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake
index d67123a9a..3b627b1d0 100644
--- a/src/or/Makefile.nmake
+++ b/src/or/Makefile.nmake
@@ -35,6 +35,7 @@ LIBTOR_OBJECTS = \
dirvote.obj \
dns.obj \
dnsserv.obj \
+ fp_pair.obj \
entrynodes.obj \
geoip.obj \
hibernate.obj \