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

[nickm at torproject.org]

commit 742ff2cddbb9676262e1b588206c3ae264f269b8
Merge: 210928f 46754d6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 12 10:27:01 2016 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6

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