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

[nickm at torproject.org]

commit 21d776738c2abf6ee0527439f7b96d35942c129c
Merge: ecc73c3 a8a860e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 6 08:31:18 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/geoip-april2017 |     4 +
 src/config/geoip        | 14366 +++++++++++++++++++++++++++++-----------------
 src/config/geoip6       |   677 ++-
 3 files changed, 9792 insertions(+), 5255 deletions(-)