[or-cvs] r13996: Mention OpenBSD_malloc_Linux.c in debian/copyright (tor/trunk/debian)

[weasel at seul.org]

Author: weasel
Date: 2008-03-12 19:18:50 -0400 (Wed, 12 Mar 2008)
New Revision: 13996

Modified:
   tor/trunk/debian/changelog
   tor/trunk/debian/copyright
Log:
Mention OpenBSD_malloc_Linux.c in debian/copyright


Modified: tor/trunk/debian/changelog
===================================================================
--- tor/trunk/debian/changelog	2008-03-12 21:45:49 UTC (rev 13995)
+++ tor/trunk/debian/changelog	2008-03-12 23:18:50 UTC (rev 13996)
@@ -6,8 +6,9 @@
     found in DEB_BUILD_OPTIONS.  Hopefully this deals with some of the
     horrible memory fragmentation that glibc's malloc causes.
   * Forward port patch 06_add_compile_time_defaults.
+  * Mention OpenBSD_malloc_Linux.c in debian/copyright.
 
- -- Peter Palfrader <weasel at debian.org>  Tue, 11 Mar 2008 15:33:07 +0100
+ -- Peter Palfrader <weasel at debian.org>  Thu, 13 Mar 2008 00:18:19 +0100
 
 tor (0.2.0.21-rc-1) experimental; urgency=low
 

Modified: tor/trunk/debian/copyright
===================================================================
--- tor/trunk/debian/copyright	2008-03-12 21:45:49 UTC (rev 13995)
+++ tor/trunk/debian/copyright	2008-03-12 23:18:50 UTC (rev 13996)
@@ -12,6 +12,7 @@
 Copyright (c) 2007-2008, The Tor Project, Inc.
 strlcat, strlcpy: Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
 ht.h: Copyright (c) 2002, Christopher Clark, 2006 Nick Mathewson
+OpenBSD_malloc_Linux.c: phk at FreeBSD.ORG
 Modifications for Debian: Copyright (c) 2004, 2005, 2006, 2007, 2008 Peter Palfrader
 
 Tor is distributed under this license:
@@ -115,4 +116,9 @@
  * 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 at 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