commit fde4199e1caa094965da0904955ad34748db1e30
Merge: cb8c5c0 08e14e1
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Jun 25 11:42:47 2015 -0400
Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4
changes/geoip6-june2015 | 3 +
src/config/geoip6 | 2282 ++++++++++++++++++++++++++++++++---------------
2 files changed, 1561 insertions(+), 724 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
