From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Mon, 30 Apr 2007 04:56:05 +0000 (-0700)
Subject: update licence to allow linking with OpenSSL
X-Git-Tag: allmydata-tahoe-0.2.0~74
X-Git-Url: https://git.rkrishnan.org/somewhere?a=commitdiff_plain;h=be700b555e40f92cc08a327e9781a830d400254f;p=tahoe-lafs%2Ftahoe-lafs.git

update licence to allow linking with OpenSSL
---

diff --git a/COPYING b/COPYING
index 0c5b3e33..294b73f7 100644
--- a/COPYING
+++ b/COPYING
@@ -3,6 +3,11 @@ comes with the added permission that, if you become obligated to release a
 derived work under this licence (as per section 2.b), you may delay the
 fulfillment of this obligation for up to 12 months.
 
+This licence also comes with the added permission that you may link this
+program with the OpenSSL library and distribute executables, as long as you
+follow the requirements of this licence in regard to all of the software in
+the executable aside from OpenSSL.
+
 
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991