Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2024-12-06 19:41:15 +01:00 · 2014-08-13 12:52:40 -04:00
parent 4056c61608 b45f0f8fb9
commit fa7ce6d3be
5 changed files with 4518 additions and 2719 deletions
@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip to the August 7 2014 Maxmind GeoLite2 Country database.
+
@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip6 to the August 7 2014 Maxmind GeoLite2 Country database.
+
@@ -1694,7 +1694,7 @@ is non-zero):

 [[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**::
    When this option is enabled and BridgeRelay is also enabled, and we have
-    GeoIP data, Tor keeps a keep a per-country count of how many client
+    GeoIP data, Tor keeps a per-country count of how many client
    addresses have contacted it so that it can help the bridge authority guess
    which countries have blocked access to it. (Default: 1)