Author: n8fr8 Date: 2011-04-16 13:16:49 +0000 (Sat, 16 Apr 2011) New Revision: 24633

Modified: projects/android/trunk/Orbot/LICENSE Log: updating our license to include Privoxy

Modified: projects/android/trunk/Orbot/LICENSE =================================================================== --- projects/android/trunk/Orbot/LICENSE 2011-04-15 16:39:35 UTC (rev 24632) +++ projects/android/trunk/Orbot/LICENSE 2011-04-16 13:16:49 UTC (rev 24633) @@ -3,7 +3,7 @@

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 license terms that you should be aware of. @@ -41,15 +41,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

***** -Orbot contains a binary distribution of the JSocks library: -http://code.google.com/p/jsocks-mirror/ -which is licensed under the GNU Lesser General Public License: -http://www.gnu.org/licenses/lgpl.html +Orbot contains a binary distribution of Privoxy (http://www.privoxy.org/) +Copyright © 2001-2010 by Privoxy Developers ijbswa-developers@lists.sourceforge.net +http://www.privoxy.org/user-manual/copyright.html

-***** -Orbot contains the source code for HttpProxy developed and freely licensed -by: Julian Robichaux -- http://www.nsftools.com +Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. +and licensed under the GNU General Public License.

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

@@ -63,7 +69,6 @@ If you got this file as a part of a larger bundle, there may be other license terms that you should be aware of.

- =============================================================================== Tor is distributed under this license: