Commit 12a72983 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.5' into maint-0.2.6

parents 52a99cb6 304d8f3b
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
  o Minor features:
    - Update geoip and geoip6 to the October 4 2016 Maxmind GeoLite2
      Country database.
+47583 −16336

File changed.

Preview size limit exceeded, changes collapsed.

+1077 −419

File changed.

Preview size limit exceeded, changes collapsed.