Commit 09e272eb authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

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

parents 4302dec9 fb5a858a
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
  o Minor features:
    - Update geoip and geoip6 to the September 3 2015 Maxmind GeoLite2 Country database.
+3017 −960

File changed.

Preview size limit exceeded, changes collapsed.

+1485 −1109

File changed.

Preview size limit exceeded, changes collapsed.