commit 9d86f6665aaf3ef73bf93fd4f96dd861f894c5bd
Merge: 9d1801b 01bb260
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed Jul 29 10:48:13 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
changes/geoip-july2015 | 3 +
src/config/geoip | 2975 ++++++++++++++++++++++++++++++++++--------------
src/config/geoip6 | 405 ++++---
3 files changed, 2387 insertions(+), 996 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
