diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-22 11:35:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-22 11:35:32 -0400 |
| commit | 86258df65d35b82ad4ee7480eec5d5434a28c9a8 (patch) | |
| tree | 46d2da9dc1ac1daa67363ad16391e303e0326fb7 /src/or/connection_or.c | |
| parent | 20912fbe26b310a71370dde700e65466f744034f (diff) | |
| parent | 907db008ab0007f0a02da62b68130344fc2e9353 (diff) | |
| download | tor-86258df65d35b82ad4ee7480eec5d5434a28c9a8.tar.gz tor-86258df65d35b82ad4ee7480eec5d5434a28c9a8.zip | |
Merge branch 'split_circuitbuild'
Conflicts:
src/or/circuitbuild.c
There was a huge-looking conflict in circuitbuild.c, but the only
change that had been made to circuitbuild.c since I forked off the
split_circuitbuild branch was 17442560c44e8093f9a. So I took the
split_circuitbuild version of the conflicting part, and manually
re-applied the change from 17442560c44e8093f9a..
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 92feb53af1..9cd56bb89c 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -21,12 +21,14 @@ #include "channeltls.h" #include "circuitbuild.h" #include "circuitlist.h" +#include "circuitstats.h" #include "command.h" #include "config.h" #include "connection.h" #include "connection_or.h" #include "control.h" #include "dirserv.h" +#include "entrynodes.h" #include "geoip.h" #include "main.h" #include "networkstatus.h" |