Andrew Lewman commited on 2010-12-29 13:23:33
              Zeige 1 geänderte Dateien mit 0 Einfügungen und 51 Löschungen.
            
| ... | ... | 
                      @@ -177,57 +177,6 @@ refuse a Tor relay operator's request to be listed in their  | 
                  
| 177 | 177 | 
                        directory or to remove any relay from their directory for any  | 
                    
| 178 | 178 | 
                        reason.</p>  | 
                    
| 179 | 179 | 
                         | 
                    
| 180 | 
                        -<a id="License"></a>  | 
                    |
| 181 | 
                        -<h3><a class="anchor" href="#License">Is the Tor software subject to  | 
                    |
| 182 | 
                        -any license terms?</a></h3>  | 
                    |
| 183 | 
                        -  | 
                    |
| 184 | 
                        -<p><strong>Yes.</strong> The Tor software is distributed under the  | 
                    |
| 185 | 
                        -Modified BSD license, and is reproduced below. The Vidalia software is distributed under  | 
                    |
| 186 | 
                        -the GPL v2. Privoxy is distributed under the GPL v2.  | 
                    |
| 187 | 
                        -"src/common/strlcat.c and src/common/strlcpy.c" by Todd C. Miller are  | 
                    |
| 188 | 
                        -licensed under the Modified BSD license. </p>  | 
                    |
| 189 | 
                        -  | 
                    |
| 190 | 
                        -<p>If you have Tor as a static binary with OpenSSL included, then you  | 
                    |
| 191 | 
                        -should know: "This product includes software developed by the OpenSSL Project  | 
                    |
| 192 | 
                        - for use in the OpenSSL Toolkit (http://www.openssl.org/)"</p>  | 
                    |
| 193 | 
                        -  | 
                    |
| 194 | 
                        -<p>The Tor software license is the Modified BSD, which is as follows:</p>  | 
                    |
| 195 | 
                        -<p>Copyright © 2001-2004, Roger Dingledine<br>  | 
                    |
| 196 | 
                        -Copyright © 2004-2007, Roger Dingledine, Nick Mathewson<br>  | 
                    |
| 197 | 
                        -Copyright © 2007-2008 The Tor Project, Inc.</p>  | 
                    |
| 198 | 
                        -  | 
                    |
| 199 | 
                        -<p>Redistribution and use in source and binary forms, with or without  | 
                    |
| 200 | 
                        -modification, are permitted provided that the following conditions are  | 
                    |
| 201 | 
                        -met:</p>  | 
                    |
| 202 | 
                        -  | 
                    |
| 203 | 
                        -<ul>  | 
                    |
| 204 | 
                        -  | 
                    |
| 205 | 
                        -<li>Redistributions of source code must retain the above copyright  | 
                    |
| 206 | 
                        -notice, this list of conditions and the following disclaimer.</li>  | 
                    |
| 207 | 
                        -  | 
                    |
| 208 | 
                        -<li>Redistributions in binary form must reproduce the above copyright  | 
                    |
| 209 | 
                        -notice, this list of conditions and the following disclaimer in the  | 
                    |
| 210 | 
                        -documentation and/or other materials provided with the  | 
                    |
| 211 | 
                        -distribution.</li>  | 
                    |
| 212 | 
                        -  | 
                    |
| 213 | 
                        -<li>Neither the names of the copyright owners nor the names of its  | 
                    |
| 214 | 
                        -contributors may be used to endorse or promote products derived from  | 
                    |
| 215 | 
                        -this software without specific prior written permission.</li>  | 
                    |
| 216 | 
                        -  | 
                    |
| 217 | 
                        -</ul>  | 
                    |
| 218 | 
                        -  | 
                    |
| 219 | 
                        -<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  | 
                    |
| 220 | 
                        -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  | 
                    |
| 221 | 
                        -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND  | 
                    |
| 222 | 
                        -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE  | 
                    |
| 223 | 
                        -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,  | 
                    |
| 224 | 
                        -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT  | 
                    |
| 225 | 
                        -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF  | 
                    |
| 226 | 
                        -USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON  | 
                    |
| 227 | 
                        -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT  | 
                    |
| 228 | 
                        -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF  | 
                    |
| 229 | 
                        -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>  | 
                    |
| 230 | 
                        -  | 
                    |
| 231 | 180 | 
                        </div><!-- #main -->  | 
                    
| 232 | 181 | 
                         | 
                    
| 233 | 182 | 
                        #include <foot.wmi>  | 
                    
| 234 | 183 |