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

[nickm at torproject.org]

commit d95c2809b39fc45b7c30b0f29284bae7384c7224
Merge: 19078b1 79939c6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 19 12:31:20 2016 +0200

    Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/geoip-july2016 |    4 +
 src/config/geoip       | 4615 +++++++++++++++++++++++++++++++++---------------
 src/config/geoip6      |  982 ++++++++---
 3 files changed, 3879 insertions(+), 1722 deletions(-)