Commit 306f2f0e authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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

parents 64bfc293 220e9be0

changes/geoip-march2015

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

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

changes/geoip6-march2015

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

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

src/config/geoip

+9382 −3313

File changed.

Preview size limit exceeded, changes collapsed.

src/config/geoip6

+1010 −218

File changed.

Preview size limit exceeded, changes collapsed.