From d10f2b726769ed22e6ead8a58ead9e5c4f645f8c Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 3 Jan 2006 14:07:34 +0000 Subject: Forward port 0.1.0.16 changelog and change to copyright file svn:r5722 --- debian/copyright | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'debian/copyright') diff --git a/debian/copyright b/debian/copyright index 91c268e271..bc32eadc32 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,20 +5,17 @@ It was downloaded from http://tor.eff.org/ Upstream Authors: Roger Dingledine Nick Mathewson - Matej Pfajfar - -Copyright (c) 2001-2005 Roger Dingledine -Copyright (c) 2002-2005 Nick Mathewson -Copyright (c) 2001-2003 Matej Pfajfar +Copyright (c) 2001-2004, Roger Dingledine +Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson strlcat, strlcpy: Copyright (c) 1998 Todd C. Miller tree.h: Copyright (c) 2002 Niels Provos -Modifications for Debian: Copyright (c) 2004, 2005 Peter Palfrader +Modifications for Debian: Copyright (c) 2004, 2005, 2006 Peter Palfrader The tor code is under this license: =============================================================================== Copyright (c) 2001-2004, Roger Dingledine -Copyright (c) 2004-2005, Roger Dingledine, Nick Mathewson +Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are -- cgit v1.2.3-54-g00ecf