Merge branch 'maint-0.2.5' into maint-0.2.6

6c2174d4 · Nick Mathewson · 12a72983 · db2571be · 6c2174d4 · 6c2174d4
Commit 6c2174d4 authored 8 years ago by Nick Mathewson
--- a/changes/geoip-november2016
+++ b/changes/geoip-november2016
+  o Minor features:
+    - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6