commit 90685b760363d905ddf1b2b556e064d9a24224e1 Merge: 401e70fba 0ddc2dc53 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 8 10:29:05 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-2018-02-07 | 4 + src/config/geoip | 34364 ++++++++++++++++++++++++++++++++++++--------- src/config/geoip6 | 841 +- 3 files changed, 28369 insertions(+), 6840 deletions(-)