Commit ae223138 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.2.4' into maint-0.2.5

parents c3d11b11 1496056c

changes/geoip-january2016

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

    - Update geoip and geoip6 to the January 5 2016 Maxmind GeoLite2

      Country database.

src/config/geoip

+1346 −388

File changed.

Preview size limit exceeded, changes collapsed.

src/config/geoip6

+666 −215

File changed.

Preview size limit exceeded, changes collapsed.