commit e4d82da05b11a78da4858050b6d1e8d922842ca3
Merge: 46754d6 56f95ba
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Sep 7 13:53:43 2016 -0400
Merge branch 'maint-0.2.4' into maint-0.2.5
changes/geoip-september2016 | 4 +
src/config/geoip | 30846 +++++++++++++-----------------------------
src/config/geoip6 | 2373 ++--
3 files changed, 10566 insertions(+), 22657 deletions(-)