commit 5c2a3854d329cc411e05880169d6880c549a1e91 Merge: 9914f906e 08592c95f Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-september2017 | 4 + src/config/geoip | 10802 ++++++++++++++++++++++++------------------ src/config/geoip6 | 941 +++- 3 files changed, 6828 insertions(+), 4919 deletions(-)