commit 400df18688e3b657852a9007151aaf26febe29a6
Merge: 1adc2bf ae22313
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Jan 7 09:14:05 2016 -0800
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-january2016 | 4 +
src/config/geoip | 1734 +++++++++++++++++++++++++++++++++++----------
src/config/geoip6 | 881 +++++++++++++++++------
3 files changed, 2016 insertions(+), 603 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
