commit b0428b6dc7051a463de7bfd0b7f8a9d13a9d679f Merge: 6c273d86e 3cfcfbac4 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 3 09:27:43 2019 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/geoip-2019-04-02 | 4 + src/config/geoip | 10355 +++++++++++++++++++++++++-------------------- src/config/geoip6 | 2337 ++++++---- 3 files changed, 7344 insertions(+), 5352 deletions(-)