[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

commit d642ceb8dff5e837bc0e27f9f50812beece06401 Merge: 7549259 2cfecec Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 8 10:12:06 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)