commit 306f2f0eff1b7d1c4bbee8b600a962d537c566f3
Merge: 64bfc29 220e9be
Author: Nick Mathewson <[email protected]>
Date: Mon Mar 9 16:24:44 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
changes/geoip-march2015 | 3 +
changes/geoip6-march2015 | 3 +
src/config/geoip |12695 ++++++++++++++++++++++++++++++++++------------
src/config/geoip6 | 1228 ++++-
4 files changed, 10398 insertions(+), 3531 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
