commit 43c18b1b7a1a10d36e16393b9f35b519f1c40fa9 Merge: f2a3041 124062e Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 13 14:37:42 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

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