[or-cvs] r23289: {website} link to the license file. (website/trunk/eff/en)

Andrew Lewman andrew at torproject.org
Thu Sep 23 16:55:12 UTC 2010


Author: phobos
Date: 2010-09-23 16:55:12 +0000 (Thu, 23 Sep 2010)
New Revision: 23289

Modified:
   website/trunk/eff/en/tor-legal-faq.wml
Log:
link to the license file.


Modified: website/trunk/eff/en/tor-legal-faq.wml
===================================================================
--- website/trunk/eff/en/tor-legal-faq.wml	2010-09-23 11:19:21 UTC (rev 23288)
+++ website/trunk/eff/en/tor-legal-faq.wml	2010-09-23 16:55:12 UTC (rev 23289)
@@ -191,43 +191,10 @@
 should know: "This product includes software developed by the OpenSSL Project
  for use in the OpenSSL Toolkit (http://www.openssl.org/)"</p>
 
-<p>The Tor software license is the Modified BSD, which is as follows:</p>
-<p>Copyright &copy 2001-2004, Roger Dingledine<br />
-Copyright &copy; 2004-2007, Roger Dingledine, Nick Mathewson<br />
-Copyright &copy; 2007-2008 The Tor Project, Inc.</p>
+<p>The Tor software license is the Modified BSD, which is available at
+<a
+href="https://gitweb.torproject.org/tor.git/blob_plain/HEAD:/LICENSE">LICENSE</a>.
 
-<p>Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:</p>
-
-<ul>
-
-<li>Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.</li>
-
-<li>Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the
-distribution.</li>
-
-<li>Neither the names of the copyright owners nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.</li>
-
-</ul>
-
-<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
-
 </div><!-- #main -->
 
 #include <foot.wmi>



More information about the tor-commits mailing list