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

[nickm at torproject.org]

commit e26f387026134b45ca4f031010abed949c600807
Merge: 765fd0845 6f8c32b7d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 11 12:23:33 2017 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2017-11-06 |    4 +
 src/config/geoip         | 9406 ++++++++++++++++++++++++++++------------------
 src/config/geoip6        |  848 ++++-
 3 files changed, 6426 insertions(+), 3832 deletions(-)