diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-07 12:47:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-07 12:47:04 -0500 |
| commit | ff5810aea91fed15a6401f0f825bb9fbe16ca200 (patch) | |
| tree | 9cdeac8199fca63c791769e5d264df0c62fde4a8 /src/or/config.c | |
| parent | c2c1f5b2a12e3c2141087ac9d787e07e531b0008 (diff) | |
| parent | 98cef0ac1e94fbcf7d1f9f70e077f22624033ecc (diff) | |
| download | tor-ff5810aea91fed15a6401f0f825bb9fbe16ca200.tar.gz tor-ff5810aea91fed15a6401f0f825bb9fbe16ca200.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 1fa8466945..087049cc7e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -197,6 +197,7 @@ static config_var_t _option_vars[] = { V(CircuitStreamTimeout, INTERVAL, "0"), V(CircuitPriorityHalflife, DOUBLE, "-100.0"), /*negative:'Use default'*/ V(ClientDNSRejectInternalAddresses, BOOL,"1"), + V(ClientRejectInternalAddresses, BOOL, "1"), V(ClientOnly, BOOL, "0"), V(ConsensusParams, STRING, NULL), V(ConnLimit, UINT, "1000"), @@ -413,6 +414,7 @@ static config_var_t testing_tor_network_defaults[] = { V(AuthDirMaxServersPerAddr, UINT, "0"), V(AuthDirMaxServersPerAuthAddr,UINT, "0"), V(ClientDNSRejectInternalAddresses, BOOL,"0"), + V(ClientRejectInternalAddresses, BOOL, "0"), V(ExitPolicyRejectPrivate, BOOL, "0"), V(V3AuthVotingInterval, INTERVAL, "5 minutes"), V(V3AuthVoteDelay, INTERVAL, "20 seconds"), |