commit 11edbf480870975a354ec13ee67958492a0fd690
Merge: f60da19 52a99cb
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed Sep 7 13:54:03 2016 -0400
Merge branch 'maint-0.2.6' into maint-0.2.7
changes/geoip-september2016 | 4 +
src/config/geoip | 30846 +++++++++++++-----------------------------
src/config/geoip6 | 2373 ++--
3 files changed, 10566 insertions(+), 22657 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
