Commit 3d18903f authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.3.3' into maint-0.3.4

parents d7259b64 ba71b178

changes/geoip-2019-01-03

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

    - Update geoip and geoip6 to the January 3 2019 Maxmind GeoLite2

      Country database. Closes ticket 29012.

src/config/geoip

+6267 −6332

File changed.

Preview size limit exceeded, changes collapsed.

src/config/geoip6

+1187 −577

File changed.

Preview size limit exceeded, changes collapsed.