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

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