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

[nickm at torproject.org]

commit 80089c9e7c16f38e398e99cbc773c3182cee9229
Merge: 5854b19 b4bb886
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 13 10:48:56 2016 -0400

    Merge branch 'maint-0.2.6' into maint-0.2.7

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