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

641c1584 · Nick Mathewson · e7e92fb2 · e0aa88d1 · 641c1584 · 641c1584
Commit 641c1584 authored 10 years ago by Nick Mathewson
--- a/changes/geoip-july2014
+++ b/changes/geoip-july2014
+  o Minor features:
+    - Update geoip to the July 10 2014 Maxmind GeoLite2 Country database.
--- a/changes/geoip6-july2014
+++ b/changes/geoip6-july2014
+  o Minor features:
+    - Update geoip6 to the July 10 2014 Maxmind GeoLite2 Country database.
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6