[or-cvs] r14125: backport from trunk: Mention OpenBSD_malloc_Linux.c in debia (tor/branches/tor-0_2_0-patches/debian)

[weasel at seul.org]

Author: weasel
Date: 2008-03-19 03:50:42 -0400 (Wed, 19 Mar 2008)
New Revision: 14125

Modified:
   tor/branches/tor-0_2_0-patches/debian/changelog
   tor/branches/tor-0_2_0-patches/debian/copyright
Log:
backport from trunk: Mention OpenBSD_malloc_Linux.c in debian/copyright.

Modified: tor/branches/tor-0_2_0-patches/debian/changelog
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/changelog	2008-03-19 07:46:46 UTC (rev 14124)
+++ tor/branches/tor-0_2_0-patches/debian/changelog	2008-03-19 07:50:42 UTC (rev 14125)
@@ -1,3 +1,9 @@
+tor (0.2.0.22-rc-2) XXperimental; urgency=low
+
+  * Mention OpenBSD_malloc_Linux.c in debian/copyright.
+
+ -- Peter Palfrader <weasel at debian.org>  Wed, 19 Mar 2008 08:50:18 +0100
+
 tor (0.2.0.22-rc-1) experimental; urgency=low
 
   * New upstream version.

Modified: tor/branches/tor-0_2_0-patches/debian/copyright
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/copyright	2008-03-19 07:46:46 UTC (rev 14124)
+++ tor/branches/tor-0_2_0-patches/debian/copyright	2008-03-19 07:50:42 UTC (rev 14125)
@@ -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