commit 5d516315f571e9a6e81d80fbf08fccbdb5e72060
Merge: 2ef4a59a4 2984d9916
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Oct 5 11:03:35 2017 -0400
Merge branch 'maint-0.2.9' into release-0.2.9
changes/geoip-october2017 | 4 +
src/config/geoip | 8683 +++++++++++++++++++++++++++------------------
src/config/geoip6 | 653 ++--
3 files changed, 5654 insertions(+), 3686 deletions(-)