commit 0691feda265a954436cd3635cbe4149bff7e6a1a Merge: 17f20c7 c77ace6 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 11 09:13:24 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

changes/geoip-january2017 | 4 + src/config/geoip | 3160 +++++++++++++++++++++++++++++---------------- src/config/geoip6 | 561 +++++++- 3 files changed, 2552 insertions(+), 1173 deletions(-)