Merge branch 'maint-0.2.9' into maint-0.3.4

a521c427 · Nick Mathewson · cbce8ded · 4e262196 · a521c427 · a521c427
Commit a521c427 authored May 17, 2019 by Nick Mathewson 🤹
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 11335 additions and 7847 deletions

changes/geoip-2019-05-13 changes/geoip-2019-05-13 +4 -0

src/config/geoip src/config/geoip +8840 -6567

src/config/geoip6 src/config/geoip6 +2491 -1280

No files found.
--- a/changes/geoip-2019-05-13
+++ b/changes/geoip-2019-05-13
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the May 13 2019 Maxmind GeoLite2
+      Country database. Closes ticket 30522.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6