commit a378b2239454bd66860094bacc693e88637d6dfe
Merge: 55492e7 b5f6495
Author: Nick Mathewson <[email protected]>
Date: Mon Apr 27 14:13:06 2015 -0400
Merge remote-tracking branch 'karsten/geoip6-apr2015' into release-0.2.4
changes/geoip6-april2015 | 2 +
src/config/geoip6 | 1268 ++++++++++++++++++++++++++++++++++++----------
2 files changed, 1013 insertions(+), 257 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
