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

[nickm at torproject.org]

commit d7810bb4a35cc0d0359b26856e1adeaf5c2bfdf8
Merge: 956c61e 3833f67
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 09:11:44 2017 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/geoip-january2017 |    4 +
 src/config/geoip          | 3160 +++++++++++++++++++++++++++++----------------
 src/config/geoip6         |  561 +++++++-
 3 files changed, 2552 insertions(+), 1173 deletions(-)