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

commit 11661747a513b9dadf89da4612a8c8912c2a1622 Merge: 788a05a a86f95d Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 13 14:39:23 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-february2017 | 4 + src/config/geoip | 10832 ++++++++++++++++++++++++------------------- src/config/geoip6 | 1651 ++++++- 3 files changed, 7351 insertions(+), 5136 deletions(-)