[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
nickm at torproject.org
nickm at torproject.org
Mon Nov 7 14:32:40 UTC 2016
commit 1ffe29ff8d128976790df89a5f7a9c1db14a40d3
Merge: d27160b db2571b
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Nov 7 09:30:05 2016 -0500
Merge branch 'maint-0.2.5' into release-0.2.5
changes/geoip-november2016 | 4 +
src/config/geoip | 4025 ++++++++++++++++++++++++++++----------------
src/config/geoip6 | 2490 ++++++++++-----------------
3 files changed, 3407 insertions(+), 3112 deletions(-)
More information about the tor-commits
mailing list