commit ba71b178655fcec2ad55383987001d2fd6a3873d Merge: fee2eaf2d 445d6750f Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jan 7 08:43:45 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-01-03 | 4 + src/config/geoip | 12599 ++++++++++++++++++++++----------------------- src/config/geoip6 | 1764 ++++--- 3 files changed, 7458 insertions(+), 6909 deletions(-)