[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
nickm at torproject.org
nickm at torproject.org
Fri Aug 12 14:27:43 UTC 2016
commit 459e5d705eb688642d53f38c00e0a2c6cfd36b8a
Merge: 6b740aa db372ad
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Aug 12 10:27:14 2016 -0400
Merge branch 'maint-0.2.7' into maint-0.2.8
changes/geoip-august2016 | 4 +
src/config/geoip | 14009 +++++++++++++++++++++++++--------------------
src/config/geoip6 | 1108 +++-
3 files changed, 8582 insertions(+), 6539 deletions(-)
More information about the tor-commits
mailing list