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

[nickm at torproject.org]

commit b4bb88606e52c21c3b831a957516057004152bf4
Merge: 0b477bf f25f7b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 13 10:48:48 2016 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

 changes/geoip-jun2016 |    4 +
 src/config/geoip      | 3349 +++++++++++++++++++++++++++++++++++--------------
 src/config/geoip6     | 1366 ++++++++++++++++----
 3 files changed, 3527 insertions(+), 1192 deletions(-)