summaryrefslogtreecommitdiff
path: root/debian/copyright
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2008-03-12 23:18:50 +0000
committerPeter Palfrader <peter@palfrader.org>2008-03-12 23:18:50 +0000
commitfb1e1453d39173b5d9f49f6c444f7b9dc3c76b48 (patch)
tree581c153a00caf3dd781b0eeec6001a3e0f8b8635 /debian/copyright
parent11e464c3312cb2813ce326fd83ea88364edb0f4a (diff)
downloadtor-fb1e1453d39173b5d9f49f6c444f7b9dc3c76b48.tar.gz
tor-fb1e1453d39173b5d9f49f6c444f7b9dc3c76b48.zip
Mention OpenBSD_malloc_Linux.c in debian/copyright
svn:r13996
Diffstat (limited to 'debian/copyright')
-rw-r--r--debian/copyright8
1 files changed, 7 insertions, 1 deletions
diff --git a/debian/copyright b/debian/copyright
index e646551b21..ca8ad0b3a6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,6 +12,7 @@ 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
+OpenBSD_malloc_Linux.c: phk@FreeBSD.ORG
Modifications for Debian: Copyright (c) 2004, 2005, 2006, 2007, 2008 Peter Palfrader
Tor is distributed under this license:
@@ -115,4 +116,9 @@ ht.h by Nick Mathewson is licensed as follows:
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
+===============================================================================
+OpenBSD_malloc_Linux.c:
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you
+ * can do whatever you want with this stuff. If we meet some day, and you think
+ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp