commit a797a69679052e8c7b7ef82cb2d7ea8f0f0b0820 Merge: ed05b7ddd 2e770216c Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 12 09:56:50 2019 -0500

Merge branch 'maint-0.3.5'

changes/geoip-2019-02-05 | 4 + src/config/geoip | 22020 ++++++++++++++++++++++++++++++++------------- src/config/geoip6 | 2401 +++-- 3 files changed, 16972 insertions(+), 7453 deletions(-)