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

[nickm at torproject.org]

commit c8069de2104d35941a2b015338970227cb853a22
Merge: c217d6d f5fdf18
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 09:30:50 2016 -0500

    Merge branch 'maint-0.2.7' into release-0.2.7

 changes/geoip-november2016 |    4 +
 src/config/geoip           | 4025 ++++++++++++++++++++++++++++----------------
 src/config/geoip6          | 2490 ++++++++++-----------------
 3 files changed, 3407 insertions(+), 3112 deletions(-)