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

[nickm at torproject.org]

commit c0257f14cdf43e2b13d103fdbebf917383fbded6
Merge: 2f6a66a 124062e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 13 14:39:13 2017 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

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