Commit 67a313f0 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.2.5' into maint-0.2.9

parents 9eb6f9d3 3418a3a7

changes/geoip-2018-03-08

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

    - Update geoip and geoip6 to the March 8 2018 Maxmind GeoLite2

      Country database. Closes ticket 25469.

src/config/geoip

+9418 −26964

File changed.

Preview size limit exceeded, changes collapsed.

src/config/geoip6

+548 −114

File changed.

Preview size limit exceeded, changes collapsed.