commit 5c78bd32246fb4c3cb966474b135ddb2dc1ad57f Merge: ea1de8443 9b4ecbaa7 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 6 14:29:45 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

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