commit 65d4551a3fe7143a5ce82888542209dfb3390e60 Merge: 5689caeda 5ba3d09a8 Author: Nick Mathewson nickm@torproject.org Date: Sun Nov 11 11:57:52 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-2018-11-06 | 4 + src/config/geoip | 22164 +++++++++++++++++++++++---------------------- src/config/geoip6 | 2572 ++++-- 3 files changed, 13068 insertions(+), 11672 deletions(-)