Commit 418b6f81 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 1c1d71fe fd082c39

changes/geoip-june2015

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

    - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database.

changes/geoip6-june2015

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

    - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database.

src/config/geoip

+6996 −7351

File changed.

Preview size limit exceeded, changes collapsed.

src/config/geoip6

+1558 −724

File changed.

Preview size limit exceeded, changes collapsed.