[or-cvs] And tree.h is by Nils. Thanks arma

Peter Palfrader weasel at seul.org
Sat Mar 20 02:07:39 UTC 2004


Update of /home/or/cvsroot/debian
In directory moria.mit.edu:/tmp/cvs-serv28924

Modified Files:
	copyright 
Log Message:
And tree.h is by Nils.  Thanks arma

Index: copyright
===================================================================
RCS file: /home/or/cvsroot/debian/copyright,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- copyright	17 Mar 2004 13:25:10 -0000	1.2
+++ copyright	20 Mar 2004 02:07:37 -0000	1.3
@@ -9,10 +9,11 @@
 
 
 Copyright (c) 2001-2004, Roger Dingledine
-strlcat and strlcpy: copyright 1998 Todd C. Miller <Todd.Miller at courtesan.com>
-Modifications for Debian: Copyright (C) 2004 Peter Palfrader <weasel at debian.org>
+strlcat, strlcpy: Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+tree.h: Copyright (c) 2002 Niels Provos <provos at citi.umich.edu>
+Modifications for Debian: Copyright (c) 2004 Peter Palfrader <weasel at 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 @@
 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 at 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 at courtesan.com>



More information about the tor-commits mailing list