commit 809217e6f3665e20718a406871585fa932dd4578
Merge: 01bb260 8b3e0b7
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Sep 24 10:06:00 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-september2015 | 3 +
src/config/geoip | 3977 ++++++++++++++++++++++++++++++++-----------
src/config/geoip6 | 2594 ++++++++++++++++------------
3 files changed, 4505 insertions(+), 2069 deletions(-)