commit 30ecd90961a1e878641b0fd054b82d8ab17a2318 Merge: ea890d7de 57798eb1c Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 6 09:26:31 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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