commit d6f77b99dac1a368514cfcfc1d6c5908ef6dd74a Merge: 1c248fa27 155b0f552 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 6 14:29:38 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

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