[or-cvs] r23999: {website} remove the entire license question since it has little to do (website/trunk/eff/en)

[Andrew Lewman]

Author: phobos
Date: 2010-12-29 12:23:33 +0000 (Wed, 29 Dec 2010)
New Revision: 23999

Modified:
   website/trunk/eff/en/tor-legal-faq.wml
Log:
remove the entire license question since it has little to do with relay
operators.


Modified: website/trunk/eff/en/tor-legal-faq.wml
===================================================================
--- website/trunk/eff/en/tor-legal-faq.wml	2010-12-27 17:52:47 UTC (rev 23998)
+++ website/trunk/eff/en/tor-legal-faq.wml	2010-12-29 12:23:33 UTC (rev 23999)
@@ -177,57 +177,6 @@
 directory or to remove any relay from their directory for any
 reason.</p>
 
-<a id="License"></a>
-<h3><a class="anchor" href="#License">Is the Tor software subject to
-any license terms?</a></h3>
-
-<p><strong>Yes.</strong> The Tor software is distributed under the
-Modified BSD license, and is reproduced below.  The Vidalia software is distributed under
-the GPL v2.  Privoxy is distributed under the GPL v2.  
-"src/common/strlcat.c and src/common/strlcpy.c" by Todd C. Miller are
-licensed under the Modified BSD license. </p>
-
-<p>If you have Tor as a static binary with OpenSSL included, then you
-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>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>