Commit 0c2fb64d authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

parents bc56918e 78735f87

changes/geoip-may2013

0 → 100644
+3 −0
Changes for changes/geoip-may2013: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
  o Minor features:

    - Update to the May 9 2013 Maxmind GeoLite Country database.

src/config/geoip

+10218 −10155

File changed.

Preview size limit exceeded, changes collapsed.