summaryrefslogtreecommitdiff
path: root/debian/copyright
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2008-02-03 20:51:14 +0000
committerPeter Palfrader <peter@palfrader.org>2008-02-03 20:51:14 +0000
commit66292f279c1ed1f4378d83f40fe9e970ac877c06 (patch)
tree108ceef93e705d61d3a1ab827541cff81a4e335d /debian/copyright
parenta06b6c7a616a96ab24185a7a592d14add7e286be (diff)
downloadtor-66292f279c1ed1f4378d83f40fe9e970ac877c06.tar.gz
tor-66292f279c1ed1f4378d83f40fe9e970ac877c06.zip
Copyright file update
svn:r13366
Diffstat (limited to 'debian/copyright')
-rw-r--r--debian/copyright4
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/copyright b/debian/copyright
index f010a4580f..e646551b21 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,14 +9,16 @@ Upstream Authors: Roger Dingledine <arma@freehaven.net>
Copyright (c) 2001 Matej Pfajfar
Copyright (c) 2001-2004, Roger Dingledine
Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+Copyright (c) 2007-2008, The Tor Project, Inc.
strlcat, strlcpy: Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
ht.h: Copyright (c) 2002, Christopher Clark, 2006 Nick Mathewson
-Modifications for Debian: Copyright (c) 2004, 2005, 2006 Peter Palfrader
+Modifications for Debian: Copyright (c) 2004, 2005, 2006, 2007, 2008 Peter Palfrader
Tor is distributed under this license:
===============================================================================
Copyright (c) 2001-2004, Roger Dingledine
Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+Copyright (c) 2007-2008, The Tor Project, Inc.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are