summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2004-03-20 02:07:37 +0000
committerPeter Palfrader <peter@palfrader.org>2004-03-20 02:07:37 +0000
commit52356f3e16f809c46ead4a438e7bc5cfd6c5af66 (patch)
treec38cf41882e0d5da563f801fdf4bf46f90968fc5
parentda9d5ccfdada2b7f306b3da047b1871e117ac5fe (diff)
downloadtor-52356f3e16f809c46ead4a438e7bc5cfd6c5af66.tar.gz
tor-52356f3e16f809c46ead4a438e7bc5cfd6c5af66.zip
And tree.h is by Nils. Thanks arma
svn:r1311
-rw-r--r--debian/copyright33
1 files changed, 30 insertions, 3 deletions
diff --git a/debian/copyright b/debian/copyright
index df89d52c68..3416dd4cd8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,10 +9,11 @@ Upstream Authors: Roger Dingledine <arma@freehaven.net>
Copyright (c) 2001-2004, Roger Dingledine
-strlcat and strlcpy: copyright 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-Modifications for Debian: Copyright (C) 2004 Peter Palfrader <weasel@debian.org>
+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 Peter Palfrader <weasel@debian.org>
-The tor code is licensed under this license:
+The tor code is under this license:
===============================================================================
Copyright (c) 2001-2004, Roger Dingledine
@@ -45,6 +46,32 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
===============================================================================
+tree.h by Niels Provos is licensed as follows:
+
+ * Copyright 2002 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===============================================================================
strlcat and strlcpy by Todd C. Miller are licensed under the following license:
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>