[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit 6a7d11f38a01b315fb5d7da9ad1d271991d2644e
Merge: 925f76b 2ee3dbe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 13 10:49:24 2016 -0400

    Merge branch 'maint-0.2.8'

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