diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-27 16:16:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-27 16:16:27 -0400 |
| commit | 0c5a44ed0a790951bdfd319eec734c04eb972a08 (patch) | |
| tree | 89f4945bd65bc06450b95131cfcf04b6da54fd5d /src/or/config.c | |
| parent | e232938ec82c8c35b99331995d1aeaca67ba9ec1 (diff) | |
| parent | bffe0d3ccc6b49975eae9173b0c1c465d40d2dbf (diff) | |
| download | tor-0c5a44ed0a790951bdfd319eec734c04eb972a08.tar.gz tor-0c5a44ed0a790951bdfd319eec734c04eb972a08.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
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 372b8911f5..a7d6a21a74 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -278,6 +278,7 @@ static config_var_t _option_vars[] = { V(ExitPolicy, LINELIST, NULL), V(ExitPolicyRejectPrivate, BOOL, "1"), V(ExitPortStatistics, BOOL, "0"), + V(ExtendAllowPrivateAddresses, BOOL, "0"), V(ExtraInfoStatistics, BOOL, "1"), #if defined (WINCE) @@ -475,6 +476,7 @@ static const config_var_t testing_tor_network_defaults[] = { V(ClientRejectInternalAddresses, BOOL, "0"), V(CountPrivateBandwidth, BOOL, "1"), V(ExitPolicyRejectPrivate, BOOL, "0"), + V(ExtendAllowPrivateAddresses, BOOL, "1"), V(V3AuthVotingInterval, INTERVAL, "5 minutes"), V(V3AuthVoteDelay, INTERVAL, "20 seconds"), V(V3AuthDistDelay, INTERVAL, "20 seconds"), |