commit b650191b9c4960f37a5343db33887165094147ee Merge: 74842cce6 26e28829d Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441 ++++++++++----------------------------------- src/config/geoip6 | 753 +- 3 files changed, 7587 insertions(+), 24611 deletions(-)