diff options
author | Nick Mathewson <nickm@torproject.org> | 2010-07-29 21:54:46 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-07-29 21:54:46 -0400 |
commit | 4727adf591c4f8df115a639f67882578314eea8b (patch) | |
tree | d466d87c8d8f5ca8a7c3c60a1f7828f5030f562c /src/or/control.c | |
parent | a7b12978cee02f1fbd38887350fa8de5c59040bd (diff) | |
parent | da49a7267fee4e36cd1983158cbce7c1aa10e58a (diff) | |
download | tor-4727adf591c4f8df115a639f67882578314eea8b.tar tor-4727adf591c4f8df115a639f67882578314eea8b.tar.gz |
Merge commit 'linus/headers'
Diffstat (limited to 'src/or/control.c')
-rw-r--r-- | src/or/control.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c index ab17bec8a..7cbb1bd1f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -11,6 +11,26 @@ #define CONTROL_PRIVATE #include "or.h" +#include "buffers.h" +#include "circuitbuild.h" +#include "circuitlist.h" +#include "circuituse.h" +#include "config.h" +#include "connection.h" +#include "connection_edge.h" +#include "control.h" +#include "directory.h" +#include "dirserv.h" +#include "dnsserv.h" +#include "geoip.h" +#include "hibernate.h" +#include "main.h" +#include "networkstatus.h" +#include "policies.h" +#include "reasons.h" +#include "router.h" +#include "routerlist.h" +#include "routerparse.h" /** Yield true iff <b>s</b> is the state of a control_connection_t that has * finished authentication and is accepting commands. */ |