aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-12-20 07:18:11 +0000
committerRoger Dingledine <arma@torproject.org>2005-12-20 07:18:11 +0000
commitfbaa196dc618323bbd613c7dc92fa91dcc3345d4 (patch)
tree5657dfcbe6436c1391e7e81fa46c590c41ab4e01 /LICENSE
parenteecb835527570e3c9a9eb5bd4d0159ce4a173790 (diff)
downloadtor-fbaa196dc618323bbd613c7dc92fa91dcc3345d4.tar
tor-fbaa196dc618323bbd613c7dc92fa91dcc3345d4.tar.gz
and bump tree.h from the LICENSE too.
svn:r5629
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE26
1 files changed, 0 insertions, 26 deletions
diff --git a/LICENSE b/LICENSE
index 207e27319..ec959c242 100644
--- a/LICENSE
+++ b/LICENSE
@@ -32,32 +32,6 @@ 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.
===============================================================================
-src/or/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.
-
-===============================================================================
src/common/strlcat.c and src/common/strlcpy.c by Todd C. Miller are licensed
under the following license: