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

[nickm at torproject.org]

commit 368146370b699781334a8f380d764b3246881f52
Merge: 34a51d1 3c2d461
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 9 14:55:22 2016 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

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