Commit 1af69c18 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.3' into maint-0.3.4

parents 9b9625bd 451a84ce

changes/geoip-2018-07-03

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor features (geoip):

    - Update geoip and geoip6 to the July 3 2018 Maxmind GeoLite2

      Country database. Closes ticket 26674.

src/config/geoip

+3144 −4027

File changed.

Preview size limit exceeded, changes collapsed.

src/config/geoip6

+584 −168

File changed.

Preview size limit exceeded, changes collapsed.