commit ad70dd403bfe1fb5559588e16ff8bef231bce023 Merge: e403f8806 445d6750f Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 7 08:43:45 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599 ++++++++++++++++++++++----------------------- src/config/geoip6 | 1764 ++++--- 3 files changed, 7458 insertions(+), 6909 deletions(-)