diff options
| author | Peter Palfrader <peter@palfrader.org> | 2006-01-03 14:07:34 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2006-01-03 14:07:34 +0000 |
| commit | d10f2b726769ed22e6ead8a58ead9e5c4f645f8c (patch) | |
| tree | 3e2448774beae243e2585bcb94ff0cab4c1f72df /debian/copyright | |
| parent | f6f65c66b5194ac01f3eeb720284878e20e3f4e3 (diff) | |
| download | tor-d10f2b726769ed22e6ead8a58ead9e5c4f645f8c.tar tor-d10f2b726769ed22e6ead8a58ead9e5c4f645f8c.tar.gz | |
Forward port 0.1.0.16 changelog and change to copyright file
svn:r5722
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/debian/copyright b/debian/copyright index 91c268e27..bc32eadc3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,20 +5,17 @@ It was downloaded from http://tor.eff.org/ Upstream Authors: Roger Dingledine <arma@freehaven.net> Nick Mathewson <nickm@freehaven.net> - Matej Pfajfar <badbytes@freehaven.net> - -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 <Todd.Miller@courtesan.com> tree.h: Copyright (c) 2002 Niels Provos <provos@citi.umich.edu> -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 |