commit 3cca9a103d8d1e6afa520ce45b9e08f4f5a0d987 Merge: 79c56a6e3 6dca180ae Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 12 08:11:20 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

changes/geoip-2018-06-07 | 4 + src/config/geoip | 5848 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 810 ++++++- 3 files changed, 4354 insertions(+), 2308 deletions(-)