Merge branch 'maint-0.2.9' into maint-0.3.5

7beaaed2 · Nick Mathewson · 2abff832 · 853b6ad0 · 7beaaed2 · 7beaaed2
Commit 7beaaed2 authored Nov 11, 2019 by Nick Mathewson ❔
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 11485 additions and 7348 deletions

changes/geoip-2019-11-06 changes/geoip-2019-11-06 +4 -0

src/config/geoip src/config/geoip +9403 -6348

src/config/geoip6 src/config/geoip6 +2078 -1000

No files found.
--- a/changes/geoip-2019-11-06
+++ b/changes/geoip-2019-11-06
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2
+      Country database. Closes ticket 32440.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6