commit 8afc100cb5fab5dc6e94b1ca13b922c9a1a1fe80 Merge: 05f5f6500 3119cb506 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 11 12:04:56 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

changes/geoip-2018-09-06 | 4 + src/config/geoip | 49324 +++++++++++++-------------------------------- src/config/geoip6 | 8574 ++++---- 3 files changed, 18629 insertions(+), 39273 deletions(-)