aboutsummaryrefslogtreecommitdiff
path: root/src/or/Makefile.nmake
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2012-09-21 14:45:32 -0700
committerAndrea Shepard <andrea@torproject.org>2012-10-10 00:39:11 -0700
commitc684076fc7f685d6e0cd97f426d1474749f1da8b (patch)
tree38de821cc3bde1d578542294412ee83647cf7527 /src/or/Makefile.nmake
parentbddfb9ffa85a0fe73545fb231a0847c4101758c1 (diff)
downloadtor-c684076fc7f685d6e0cd97f426d1474749f1da8b.tar
tor-c684076fc7f685d6e0cd97f426d1474749f1da8b.tar.gz
Add circuitmux.c, circuitmux.h
Diffstat (limited to 'src/or/Makefile.nmake')
-rw-r--r--src/or/Makefile.nmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake
index b145fdcae..9f948d661 100644
--- a/src/or/Makefile.nmake
+++ b/src/or/Makefile.nmake
@@ -9,12 +9,12 @@ LIBS = ..\..\..\build-alpha\lib\libevent.a \
ws2_32.lib advapi32.lib shell32.lib
LIBTOR_OBJECTS = buffers.obj channel.obj channeltls.obj circuitbuild.obj \
- circuitlist.obj circuituse.obj command.obj config.obj connection.obj
- connection_edge.obj connection_or.obj control.obj cpuworker.obj \
- directory.obj dirserv.obj dirvote.obj dns.obj dnsserv.obj geoip.obj \
- hibernate.obj main.obj microdesc.obj networkstatus.obj \
- nodelist.obj onion.obj policies.obj reasons.obj relay.obj \
- rendclient.obj rendcommon.obj rendmid.obj rendservice.obj \
+ circuitlist.obj circuitmux.obj circuituse.obj command.obj config.obj \
+ connection.obj connection_edge.obj connection_or.obj control.obj \
+ cpuworker.obj directory.obj dirserv.obj dirvote.obj dns.obj \
+ dnsserv.obj geoip.obj hibernate.obj main.obj microdesc.obj \
+ networkstatus.obj nodelist.obj onion.obj policies.obj reasons.obj \
+ relay.obj rendclient.obj rendcommon.obj rendmid.obj rendservice.obj \
rephist.obj router.obj routerlist.obj routerparse.obj status.obj \
config_codedigest.obj ntmain.obj