dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updating our license to include Privoxy 

svn:r24633
This commit is contained in:
Nathan Freitas 2011-04-16 13:16:49 +00:00
parent 3a0615855b
commit 6a2adef64d
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
LICENSE
View File

@ -3,7 +3,7 @@ provide anonymity on the Internet from a Google Android smartphone.
It also lists the licenses for other components used by Orbot. It also lists the licenses for other components used by Orbot.
For more information about Orbot, see http://guardianproject.info/ For more information about Orbot, see https://guardianproject.info/apps/orbot
If you got this file as a part of a larger bundle, there may be other If you got this file as a part of a larger bundle, there may be other
license terms that you should be aware of. license terms that you should be aware of.
@ -41,14 +41,20 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
***** *****
Orbot contains a binary distribution of the JSocks library: Orbot contains a binary distribution of Privoxy (http://www.privoxy.org/)
http://code.google.com/p/jsocks-mirror/ Copyright © 2001-2010 by Privoxy Developers <ijbswa-developers@lists.sourceforge.net>
which is licensed under the GNU Lesser General Public License: http://www.privoxy.org/user-manual/copyright.html
http://www.gnu.org/licenses/lgpl.html
***** Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc.
Orbot contains the source code for HttpProxy developed and freely licensed and licensed under the GNU General Public License.
by: Julian Robichaux -- http://www.nsftools.com
Privoxy is free software; you can redistribute it and/or modify it under the terms of the
GNU General Public License, version 2, as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for details.
http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
****** ******
Orbot contains a binary distribution of Tor: Orbot contains a binary distribution of Tor:
@ -63,7 +69,6 @@ Orbot contains a binary distribution of Tor:
If you got this file as a part of a larger bundle, If you got this file as a part of a larger bundle,
there may be other license terms that you should be aware of. there may be other license terms that you should be aware of.
=============================================================================== ===============================================================================
Tor is distributed under this license: Tor is distributed under this license: