mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.2.2'

Browse source
This commit is contained in:
Roger Dingledine 2010-11-06 17:42:37 -04:00
commit d96c9cd00e
4 changed files with 4464 additions and 4039 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/geoip-nov2010 Normal file
View file

@ -0,0 +1,3 @@
o Minor features:
- Update to the November 1 2010 Maxmind GeoLite Country database.

3
changes/geoip-oct2010
View file

@ -1,3 +0,0 @@
o Minor features:
- Update to the October 1 2010 Maxmind GeoLite Country database.

8496
src/config/geoip
View file

File diff suppressed because it is too large Load diff

1
src/or/config.c
View file

@ -416,6 +416,7 @@ static config_var_t testing_tor_network_defaults[] = {
V(TestingV3AuthInitialDistDelay, INTERVAL, "20 seconds"),
V(TestingAuthDirTimeToLearnReachability, INTERVAL, "0 minutes"),
V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"),
V(MinUptimeHidServDirectoryV2, INTERVAL, "0 minutes"),
{ NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
};
#undef VAR