tor-webwml.git

@@ -165,7 +165,8 @@ and design documentation to aid would-be implementers.</li>

 <p><b>Code:</b> the goal of this stage is to produce a working

 implementation. You may use any of the sketches, graphics, or ideas from

-the first stage, with appropriate credit to their authors.</p>

+the first stage (with appropriate credit to their authors), or you can

+make your own.</p>

 <p>

 An acceptable entry will be a package of free software that builds and

@@ -254,11 +255,7 @@ and security (to be announced).</p>

 <p>We will have a public website and wiki up shortly for FAQ entries,

 clarifications, etc.</p>

-

-

-

-

-<hr />

+<!--

 <hr />

 <h3>Testing criteria</h3>

@@ -274,6 +271,7 @@ user tell that the network is now live?</li>

 <li>The network will be disconnected or interrupted. Can the user tell

 that the network has an error?</li>

 </ul>

+-->

 <hr />

 <h3>Technical Notes</h3>

@@ -287,6 +285,31 @@ to this version will be announced to the contest web site.</p>

 and Python that demonstrate Tor's controller protocol. Code submissions

 may be able to save a lot of time by using this code as a skeleton.</p>

+<hr />

+<h3>Legal Notes</h3>

+

+<p>By submitting your entry to be considered in the Tor GUI contest, you

+hereby:</p>

+

+<ul>

+<li>(A) represent and warrant that (1) the entry was created by you and

+that you own all rights to the entry or have the authorized rights to

+submit such entry and grant the licenses below; and (2) that the

+entry does not infringe on any third party copyright or other

+intellectual property rights; AND</li>

+<li>(B) EITHER (1) grant us a worldwide, royalty-free, non-exclusive,

+perpetual license to reproduce, edit, perform, display, publish, make

+derivative works, and otherwise use the entry as we see fit,

+including without limitation, incorporating (in whole or in part)

+into the Tor software, and to sublicense such rights; OR, (2) provide

+the entry pursuant to a license that complies with the Open Source

+Definition (http://www.opensource.org/docs/definition.php), such as

+the GPL, 3-clause BSD, or MIT licenses, or (where applicable) the Creative

+Commons Attribution (http://creativecommons.org/licenses/by/2.5/)

+license. If you provide the entry pursuant to such a license, you

+must include the applicable information in your submission.</li>

+</ul>

+

   </div><!-- #main -->

 </div>