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