torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages 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
parent c109ffaef9 70411a50b1
commit d96c9cd00e
4 changed files with 4464 additions and 4039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/geoip-nov2010
+3
View File
@@ -0,0 +1,3 @@
o Minor features:
- Update to the November 1 2010 Maxmind GeoLite Country database.
changes/geoip-oct2010
-3
View File
@@ -1,3 +0,0 @@
o Minor features:
- Update to the October 1 2010 Maxmind GeoLite Country database.
src/config/geoip
+4460 -4036
View File
File diff suppressed because it is too large Load Diff
src/or/config.c
+1
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