commit c9b76a12f5682babd2b8126930107a516cef5eff
Merge: faf568fa7 6f8c32b7d
Author: Nick Mathewson <ni...@torproject.org>
Date: Sat Nov 11 12:23:33 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/geoip-2017-11-06 | 4 +
src/config/geoip | 9406 ++++++++++++++++++++++++++++------------------
src/config/geoip6 | 848 ++++-
3 files changed, 6426 insertions(+), 3832 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
