commit e0d8ce3b272371c904dbbbb5019a4b4bcb7b8927 Merge: adf46d6 7d7770f Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 6 08:33:01 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-april2017 | 4 + src/config/geoip | 14366 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 677 ++- 3 files changed, 9792 insertions(+), 5255 deletions(-)