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

[nickm at torproject.org]

commit ef996c91b84e0eacb6773f1b63fb3837229c99ab
Merge: 8e6174e 3c2d461
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 9 14:55:14 2016 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/geoip-may2016 |    4 +
 src/config/geoip      | 6991 ++++++++++++++++++++++++++++---------------------
 src/config/geoip6     |  904 +++++--
 3 files changed, 4631 insertions(+), 3268 deletions(-)