[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

7 Jan
2016
7 Jan
'16
5:48 p.m.
commit fd082c394bf392cab0c586313a82d5bb3bbd6139 Merge: 75388f6 fde4199 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 25 11:43:04 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-june2015 | 3 + changes/geoip6-june2015 | 3 + src/config/geoip |14347 +++++++++++++++++++++++------------------------ src/config/geoip6 | 2282 +++++--- 4 files changed, 8560 insertions(+), 8075 deletions(-)
3419
Age (days ago)
3419
Last active (days ago)
0 comments
1 participants
participants (1)
-
nickm@torproject.org