commit 12b68854a0055ffd697ddf07abb038ed586feb30 Merge: 8c1eb28d6 00341d97f Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 6 09:26:32 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 3151 +++++++++----- 3 files changed, 8147 insertions(+), 5108 deletions(-)