commit 2cdef2bb3417b4561559d7dab46165c220405c78
Merge: 23a9598 418b6f8
Author: Nick Mathewson <[email protected]>
Date: Fri Jul 10 11:54:49 2015 -0400
Merge branch 'maint-0.2.6' into release-0.2.6
changes/geoip-june2015 | 3 +
changes/geoip6-june2015 | 3 +
src/config/geoip |14347 +++++++++++++++++++++++------------------------
src/config/geoip6 | 2282 +++++---
4 files changed, 8560 insertions(+), 8075 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
