21 Mar
2016
21 Mar
'16
2:52 p.m.
commit 44ad3be221fb8e5e648c6d56054fb1d8596a645b Merge: e2efa9e f06d9a9 Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 5 08:13:24 2016 -0500
Merge branch 'maint-0.2.5' into maint-0.2.6
changes/geoip-february2016 | 4 + src/config/geoip | 2144 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 864 ++++++++++++++---- 3 files changed, 2328 insertions(+), 684 deletions(-)