Commit 028cac97 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'origin/maint-0.2.6'

parents 63a90f2d 0ac74835

changes/geoip-april2015

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

    - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database.

changes/geoip6-april2015

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

    - Update geoip6 to the April 8 2015 Maxmind GeoLite2 Country database.

src/config/geoip

+3449 −6612

File changed.

Preview size limit exceeded, changes collapsed.

src/config/geoip6

+1011 −257

File changed.

Preview size limit exceeded, changes collapsed.