commit e89163845a189c31f05462b1d47d607a29939836 Merge: 2e02b59 34fdd51 Author: Nick Mathewson <ni...@torproject.org> Date: Wed Jan 11 09:12:06 2017 -0500
Merge branch 'maint-0.2.5' into release-0.2.5 changes/geoip-january2017 | 4 + src/config/geoip | 3160 +++++++++++++++++++++++++++++---------------- src/config/geoip6 | 561 +++++++- 3 files changed, 2552 insertions(+), 1173 deletions(-) _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits