commit c84c5cc4022469884315d7abcb910d7b7f7d6dd2 Merge: af9bbaa 5ff0b51 Author: Nick Mathewson nickm@torproject.org Date: Mon May 8 08:08:29 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)