[tor-commits] [tor/master] Merge branch 'maint-0.2.7'

commit 58bcae37a2c63db81c8c0f8fdf47d886f072209a Merge: 63b4ce1 17cfdb3 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 9 10:37:00 2016 -0500 Merge branch 'maint-0.2.7' changes/geoip-march2016 | 4 + src/config/geoip | 8496 +++++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2270 ++++++------- 3 files changed, 6524 insertions(+), 4246 deletions(-)