commit ebb71fcff627d10789b2c67d10d9ac7a45aa265f Merge: 64afe068f d6f77b99d Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 6 14:29:41 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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