commit d309d28ca5dc63d73c7247d813f489921b8581ab Merge: 1243c10 9b90d51 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 13 14:39:21 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

changes/geoip-february2017 | 4 + src/config/geoip | 10832 ++++++++++++++++++++++++------------------- src/config/geoip6 | 1651 ++++++- 3 files changed, 7351 insertions(+), 5136 deletions(-)