Commit 7cbdec57 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 ba17cdfb df4c4840

changes/geoip-january2015

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

    - Update geoip to the January 7 2015 Maxmind GeoLite2 Country database.

changes/geoip6-january2015

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

    - Update geoip6 to the January 7 2015 Maxmind GeoLite2 Country database.

src/config/geoip

+5066 −7806

File changed.

Preview size limit exceeded, changes collapsed.

src/config/geoip6

+1002 −261

File changed.

Preview size limit exceeded, changes collapsed.