commit 5348c8996f53964ce7466f00acad33f625191983 Merge: f2e23d38a 9666c620d Author: Nick Mathewson nickm@torproject.org Date: Sat Nov 11 12:23:33 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

changes/geoip-2017-11-06 | 4 + src/config/geoip | 9406 ++++++++++++++++++++++++++++------------------ src/config/geoip6 | 848 ++++- 3 files changed, 6426 insertions(+), 3832 deletions(-)