commit ad7db10770a396b1794364b9ec17dd4c17ee14dc Merge: dc5c9af6c 2984d9916 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 5 11:03:35 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

changes/geoip-october2017 | 4 + src/config/geoip | 8683 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 653 ++-- 3 files changed, 5654 insertions(+), 3686 deletions(-)