commit 09e272eb1e0d710caccc4c618935205dbd1b22e4 Merge: 4302dec fb5a858 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 24 10:06:36 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.6'

changes/geoip-september2015 | 3 + src/config/geoip | 3977 ++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 2594 ++++++++++++++++------------ 3 files changed, 4505 insertions(+), 2069 deletions(-)