commit ecc73c3c035abe1a2c33e924e37e55064e712d56 Merge: 57e778f 933a1e7 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 8 10:10:44 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)