commit 77abd688551ac6b71bca5f57009a7d4e92042f25
Merge: c0c92c3 3681463
Author: Nick Mathewson <[email protected]>
Date: Mon May 9 14:55:31 2016 -0400
Merge branch 'maint-0.2.5' into release-0.2.5
changes/geoip-may2016 | 4 +
src/config/geoip | 6991 ++++++++++++++++++++++++++++---------------------
src/config/geoip6 | 904 +++++--
3 files changed, 4631 insertions(+), 3268 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
