commit 2e0c22d58bbb16bb47fc36246116eec866e4b954 Merge: 5a8e90265 877dd1d6c Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 20 12:15:23 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

changes/geoip-2017-12-06 | 4 + src/config/geoip | 12380 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 3373 +++++++++--- 3 files changed, 10033 insertions(+), 5724 deletions(-)