commit 3569cffe1441e2e8c754feffcdc229e9a2680d0d
Merge: 809217e 62b02a1
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Oct 9 10:12:59 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-october2015 | 3 +
src/config/geoip | 7429 +++++++++++++++++++++++++++++----------------
src/config/geoip6 | 863 ++++--
3 files changed, 5447 insertions(+), 2848 deletions(-)