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

[nickm at torproject.org]

commit 7d7770f7359763871667e0150aebc50856f9d5fd
Merge: d642ceb 91c6b18
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 6 08:31:54 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-april2017 |     4 +
 src/config/geoip        | 14366 +++++++++++++++++++++++++++++-----------------
 src/config/geoip6       |   677 ++-
 3 files changed, 9792 insertions(+), 5255 deletions(-)