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

[nickm at torproject.org]

commit 5ba8ab5a88b36c05986fee1535d4615024974e6d
Merge: ef5f2b3 220e9be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 16:24:20 2015 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/geoip-march2015  |    3 +
 changes/geoip6-march2015 |    3 +
 src/config/geoip         |12695 ++++++++++++++++++++++++++++++++++------------
 src/config/geoip6        | 1228 ++++-
 4 files changed, 10398 insertions(+), 3531 deletions(-)