Merge branch 'maint-0.2.2'

changes/geoip-nov2010

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

changes/geoip-oct2010

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

src/or/config.c

@@ -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