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

[nickm at torproject.org]

commit 64bc1490ea4a106ceb10c42273124790538bbcb7
Merge: 16bbbe8 4488c31
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 8 10:09:20 2017 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

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