[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7

[nickm at torproject.org]

commit 7fe80c29056d7e98b9443e151343c886cf8c7dd3
Merge: 1a065ce 0b477bf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 9 14:56:56 2016 -0400

    Merge branch 'maint-0.2.6' into maint-0.2.7

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