commit 4d70ed7be097593ab9ef80b52540e49d30baaf03
Merge: 7c25b41 210928f
Author: Nick Mathewson <ni...@torproject.org>
Date: Tue Jul 19 12:32:14 2016 +0200
Merge branch 'maint-0.2.6' into maint-0.2.7
changes/geoip-july2016 | 4 +
src/config/geoip | 4615 +++++++++++++++++++++++++++++++++---------------
src/config/geoip6 | 982 ++++++++---
3 files changed, 3879 insertions(+), 1722 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
