Merge branch 'maint-0.2.6' into maint-0.2.7

9c66afe7 · Nick Mathewson · e408aa3b · 089ee135 · 9c66afe7 · 9c66afe7
Commit 9c66afe7 authored 9 years ago by Nick Mathewson
--- a/changes/geoip-december2015
+++ b/changes/geoip-december2015
+  o Minor features:
+    - Update geoip and geoip6 to the December 1 2015 Maxmind GeoLite2
+      Country database.
+
--- a/src/config/geoip
+++ b/src/config/geoip
--- a/src/config/geoip6
+++ b/src/config/geoip6