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

[nickm at torproject.org]

commit 51ca3dc8116320b57cec619bca61a372a05f01ce
Merge: 45245fe 933a1e7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 8 10:10:36 2017 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

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