Commit 4897b934 authored by Matt Edman's avatar Matt Edman
Browse files

Some of that last commit is derived from the TorFAQ wiki, so let's comply with

their license.


svn:r1023
parent 7daa5bb3
Loading
Loading
Loading
Loading
+27 −0
Changes for LICENSE: 27 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -128,6 +128,33 @@ If you got Tor as a static binary with OpenSSL included, then you should know:
 for use in the OpenSSL Toolkit (http://www.openssl.org/)"
===============================================================================

Some of the help documentation text used in Vidalia is derived from the TorFAQ
Wiki <http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ>. It is licensed
under the MIT license as follows:

      Copyright (c) 2003-2006 Roger Dingledine
      Copyright (c) 2004-2005 Nick Mathewson
      Copyright (c) 2004 Douglas F. Calvert

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all 
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
===============================================================================

This product includes GeoIP data created by MaxMind, available from
http://maxmind.com. It is licensed as follows: