tor-webwml.git

@@ -181,14 +181,20 @@ reason.</p>

 <h3><a class="anchor" href="#License">Is the Tor software subject to

 any license terms?</a></h3>

-<p><strong>Yes.</strong> The Tor license is included in the software

-download and reproduced below. (However, note that the Tor download

-bundles include other software too, such as Vidalia and Privoxy, and if

-you use the bundles you will need to follow the licenses for all the

-programs they include as well.)</p>

-

-<p>Copyright (c) 2001-2004, Roger Dingledine<br />

-Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson</p>

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