commit 50911ddb37de55bfa6ff9a7452b4619f417b060a Merge: 83b46f1 54771bc Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 11 09:12:36 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

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