commit abff196c6a1e49deb7830bcebf6e03606c2eae4e Merge: c346c892a 5348c8996 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Nov 11 12:23:34 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/geoip-2017-11-06 | 4 + src/config/geoip | 9406 ++++++++++++++++++++++++++++------------------ src/config/geoip6 | 848 ++++- 3 files changed, 6426 insertions(+), 3832 deletions(-)