commit d579528033837f56f341ffc624282d1ccf819982 Merge: c043398 ab98c43 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 6 10:01:23 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/geoip-october2016 | 4 + src/config/geoip | 63919 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 1496 +- 3 files changed, 48664 insertions(+), 16755 deletions(-)