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

[nickm at torproject.org]

commit 56a2b8dc6ea3d8438562d5eb7c3595aafd23c04d
Merge: d47c52b b49369b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 9 08:34:18 2016 -0500

    Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/geoip-december2016 |    4 +
 src/config/geoip           | 6259 ++++++++++++++++++++++++++------------------
 src/config/geoip6          | 1193 ++++++++-
 3 files changed, 4705 insertions(+), 2751 deletions(-)