commit db372addc8534dc6e4639fe943179943b276b051 Merge: 4d70ed7 742ff2c Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 12 10:27:08 2016 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7

changes/geoip-august2016 | 4 + src/config/geoip | 14009 +++++++++++++++++++++++++-------------------- src/config/geoip6 | 1108 +++- 3 files changed, 8582 insertions(+), 6539 deletions(-)