commit 8c91cbb6ca579145e84f940953c33911eb1ce72b Merge: 2673b4b 54771bc Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 11 09:12:51 2017 -0500

Merge branch 'maint-0.2.6' into maint-0.2.7

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