commit a5b50ef25b94e5220655a72417736d09dbd4a3c5
Merge: 06fe8a1 7d7770f
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Apr 6 08:32:04 2017 -0400
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/geoip-april2017 | 4 +
src/config/geoip | 14366 +++++++++++++++++++++++++++++-----------------
src/config/geoip6 | 677 ++-
3 files changed, 9792 insertions(+), 5255 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
