Commit e0aa88d1 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 fa8bb25f 75501dbe

changes/geoip-july2014

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

    - Update geoip to the July 10 2014 Maxmind GeoLite2 Country database.

changes/geoip6-july2014

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

    - Update geoip6 to the July 10 2014 Maxmind GeoLite2 Country database.

src/config/geoip

+2496 −1104

File changed.

Preview size limit exceeded, changes collapsed.

src/config/geoip6

+938 −2736

File changed.

Preview size limit exceeded, changes collapsed.