Browse Source

Mention OpenBSD_malloc_Linux.c in debian/copyright

svn:r13996
Peter Palfrader 16 years ago
parent
commit
fb1e1453d3
2 changed files with 9 additions and 2 deletions
  1. 2 1
      debian/changelog
  2. 7 1
      debian/copyright

+ 2 - 1
debian/changelog

@@ -6,8 +6,9 @@ tor (0.2.0.21-rc-+svn) XXperimental; urgency=low
     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@debian.org>  Tue, 11 Mar 2008 15:33:07 +0100
+ -- Peter Palfrader <weasel@debian.org>  Thu, 13 Mar 2008 00:18:19 +0100
 
 tor (0.2.0.21-rc-1) experimental; urgency=low
 

+ 7 - 1
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