Commit b45f0f8f authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4

parents 244ca67e 6235b476
Loading
Loading
Loading
Loading
+3 −0
Changes for changes/geoip6-august2014: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
  o Minor features:
    - Update geoip6 to the August 7 2014 Maxmind GeoLite2 Country database.
+684 −1328

File changed.

Preview size limit exceeded, changes collapsed.