commit 8a163e95793dc44860c992dbcf922f249017d2a3 Merge: 06b9f75 6494f33 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 7 13:54:46 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/geoip-september2016 | 4 + src/config/geoip | 30846 +++++++++++++----------------------------- src/config/geoip6 | 2373 ++-- 3 files changed, 10566 insertions(+), 22657 deletions(-)