commit 3913f959e3688cfa91f9fab5368ba149e00cfec6
Merge: eb92d11 325c507
Author: Nick Mathewson <ni...@torproject.org>
Date: Fri Jun 9 09:58:45 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-june2017 | 4 +
src/config/geoip | 5079 +++++++++++++++++++++++++-----------------------
src/config/geoip6 | 1952 +++++++++++++++++--
3 files changed, 4449 insertions(+), 2586 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
