aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-04-30 09:18:48 +0000
committerRoger Dingledine <arma@torproject.org>2007-04-30 09:18:48 +0000
commit7fb4365cd3286f8fc41f6d588c12f6f7baa4b39b (patch)
tree2e8099117b3f6359d831185462eea5d0c5d2630e /src/or/config.c
parent313ac313be7189860114fdd31fcaab1b0de7393a (diff)
downloadtor-7fb4365cd3286f8fc41f6d588c12f6f7baa4b39b.tar
tor-7fb4365cd3286f8fc41f6d588c12f6f7baa4b39b.tar.gz
Add a new config option __DisablePredictedCircuits designed for
use by the controller, when we don't want Tor to build any circuits preemptively. svn:r10054
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 568cd934b..3a11b7d78 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -123,7 +123,6 @@ static config_var_t _option_vars[] = {
VAR("AccountingMax", MEMUNIT, AccountingMax, "0 bytes"),
VAR("AccountingStart", STRING, AccountingStart, NULL),
VAR("Address", STRING, Address, NULL),
- VAR("__AllDirActionsPrivate",BOOL, AllDirActionsPrivate, "0"),
VAR("AllowInvalidNodes", CSV, AllowInvalidNodes,
"middle,rendezvous"),
VAR("AllowNonRFC953Hostnames", BOOL, AllowNonRFC953Hostnames, "0"),
@@ -258,6 +257,8 @@ static config_var_t _option_vars[] = {
VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"),
VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"),
VAR("VirtualAddrNetwork", STRING, VirtualAddrNetwork, "127.192.0.0/10"),
+ VAR("__AllDirActionsPrivate",BOOL, AllDirActionsPrivate, "0"),
+ VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits,"0"),
VAR("__LeaveStreamsUnattached", BOOL,LeaveStreamsUnattached, "0"),
{ NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
};