diff options
| author | Peter Palfrader <peter@palfrader.org> | 2008-03-19 07:50:42 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2008-03-19 07:50:42 +0000 |
| commit | 8b8f7ed919a5601b8b4ef2356df9ce458843c332 (patch) | |
| tree | 6c90af0e9dec33710ba210f0588d060a5ba01f27 /debian | |
| parent | 9dcc7b714b31d1dff2b2f240fbcd896ee8fc1647 (diff) | |
| download | tor-8b8f7ed919a5601b8b4ef2356df9ce458843c332.tar.gz tor-8b8f7ed919a5601b8b4ef2356df9ce458843c332.zip | |
backport from trunk: Mention OpenBSD_malloc_Linux.c in debian/copyright.
svn:r14125
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/copyright | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 40f206bf71..535324e622 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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@debian.org> Wed, 19 Mar 2008 08:50:18 +0100 + tor (0.2.0.22-rc-1) experimental; urgency=low * New upstream version. 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 |