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

[nickm at torproject.org]

commit e17659b7011fa63b398b244f2cef225636ea08d5
Merge: 4e10ada1e 09618ffe3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 7 15:18:00 2017 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-september2017 |     4 +
 src/config/geoip            | 10802 ++++++++++++++++++++++++------------------
 src/config/geoip6           |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)