commit 9b4ecbaa7d5a19c2ddbb5e2c442e19c248930a7b Merge: a999cb43d d6f77b99d Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 6 14:29:43 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163 ++++++++++++++++++++++++--------------------- src/config/geoip6 | 2251 ++++++--- 3 files changed, 8221 insertions(+), 6197 deletions(-)