Commit 0ddc2dc5 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.2.5' into maint-0.2.9

parents a2aaf950 f1278b7e

changes/geoip-2018-02-07

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

    - Update geoip and geoip6 to the February 7 2018 Maxmind GeoLite2

      Country database.

src/config/geoip

+27669 −6695

File changed.

Preview size limit exceeded, changes collapsed.

src/config/geoip6

+696 −145

File changed.

Preview size limit exceeded, changes collapsed.