[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.4' into maint-0.2.5

commit 933a1e79975226c357d9d7f32be479a4868bb8d7 Merge: 884b371 4488c31 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 8 10:10:29 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)