commit 04a8e81fa9d323819a7294f80aca9477794386bc Merge: 9cbc40e37 0ddc2dc53 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 8 10:29:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/geoip-2018-02-07 | 4 + src/config/geoip | 34364 ++++++++++++++++++++++++++++++++++++--------- src/config/geoip6 | 841 +- 3 files changed, 28369 insertions(+), 6840 deletions(-)