commit 2eb5eca0885a45449e7457e594484cdd71fd6cde Merge: 26ea56a 75fe218 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 13 14:39:19 2017 -0500

Merge branch 'maint-0.2.7' into release-0.2.7

changes/geoip-february2017 | 4 + src/config/geoip | 10832 ++++++++++++++++++++++++------------------- src/config/geoip6 | 1651 ++++++- 3 files changed, 7351 insertions(+), 5136 deletions(-)