commit 7c3f210e709703a3ce3e36107166f67c31f4c8e1
Merge: c464a36 5521366
Author: Nick Mathewson <ni...@torproject.org>
Date: Fri Oct 9 10:14:59 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7
changes/geoip-october2015 | 3 +
src/config/geoip | 7429 +++++++++++++++++++++++++++++----------------
src/config/geoip6 | 863 ++++--
3 files changed, 5447 insertions(+), 2848 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
