aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-10-22 11:35:32 -0400
committerNick Mathewson <nickm@torproject.org>2012-10-22 11:35:32 -0400
commit86258df65d35b82ad4ee7480eec5d5434a28c9a8 (patch)
tree46d2da9dc1ac1daa67363ad16391e303e0326fb7 /src/or/config.c
parent20912fbe26b310a71370dde700e65466f744034f (diff)
parent907db008ab0007f0a02da62b68130344fc2e9353 (diff)
downloadtor-86258df65d35b82ad4ee7480eec5d5434a28c9a8.tar
tor-86258df65d35b82ad4ee7480eec5d5434a28c9a8.tar.gz
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/config.c')
-rw-r--r--src/or/config.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 30376b86f..da73f783f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -27,6 +27,7 @@
#include "dirserv.h"
#include "dirvote.h"
#include "dns.h"
+#include "entrynodes.h"x
#include "geoip.h"
#include "hibernate.h"
#include "main.h"