Commit 0ac74835 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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

parents f620b8f0 6c7720ed

changes/geoip-april2015

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features:

    - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database.

changes/geoip6-april2015

0 → 100644
+2 −0
Original line number Diff line number Diff line 
  o Minor features:

    - Update geoip6 to the April 8 2015 Maxmind GeoLite2 Country database.

src/config/geoip

+3449 −6612

File changed.

File size exceeds preview limit.

View original file
View changed file