commit b69fe15b59f440eda3a99480f3aa4c9fbb603f54 Merge: 43c354d48 19429fac2 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 11 12:04:55 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-2018-09-06 | 4 + src/config/geoip | 49324 +++++++++++++-------------------------------- src/config/geoip6 | 8574 ++++---- 3 files changed, 18629 insertions(+), 39273 deletions(-)