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

d8517fe8 · Nick Mathewson · 4a6b43bf · 7cbdec57 · d8517fe8 · d8517fe8
Commit d8517fe8 authored 10 years ago by Nick Mathewson
--- a/changes/geoip-january2015
+++ b/changes/geoip-january2015
+  o Minor features:
+    - Update geoip to the January 7 2015 Maxmind GeoLite2 Country database.
+
--- a/changes/geoip6-january2015
+++ b/changes/geoip6-january2015
+  o Minor features:
+    - Update geoip6 to the January 7 2015 Maxmind GeoLite2 Country database.
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6