Commit 400df186 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.2.5' into maint-0.2.6

parents 1adc2bf6 ae223138
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
  o Minor features:
    - Update geoip and geoip6 to the January 5 2016 Maxmind GeoLite2
      Country database.
+1346 −388

File changed.

Preview size limit exceeded, changes collapsed.

+666 −215

File changed.

Preview size limit exceeded, changes collapsed.