Commit d96c9cd0 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge branch 'maint-0.2.2'

parents c109ffae 70411a50

changes/geoip-nov2010

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features:

    - Update to the November 1 2010 Maxmind GeoLite Country database.

changes/geoip-oct2010

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
  o Minor features:

    - Update to the October 1 2010 Maxmind GeoLite Country database.

src/config/geoip

+4460 −4036

File changed.

Preview size limit exceeded, changes collapsed.

src/or/config.c

+1 −0
Original line number Diff line number Diff line
@@ -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