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

[nickm at torproject.org]

commit d6021989d9a4562a5a1a3f65ba3ac45178921fe9
Merge: 4e5df73 2cfecec
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 8 10:11:58 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-march2017 |     4 +
 src/config/geoip        | 13115 +++++++++++++++++++---------------------------
 src/config/geoip6       |   754 ++-
 3 files changed, 5884 insertions(+), 7989 deletions(-)