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

[nickm at torproject.org]

commit 46754d608110fce07fb286365b67209b35397194
Merge: d95c280 1410947
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 12 10:26:48 2016 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/geoip-august2016 |     4 +
 src/config/geoip         | 14009 +++++++++++++++++++++++++--------------------
 src/config/geoip6        |  1108 +++-
 3 files changed, 8582 insertions(+), 6539 deletions(-)