[tor-commits] [orbot/master] update license to include badvpn

[n8fr8@xxxxxxxxxxxxxx]

commit 3cc2439b5f2f9fb4f36fadff8b988362ee3ff649
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date:   Fri Jan 29 17:05:29 2016 -0500

    update license to include badvpn
---
 LICENSE | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/LICENSE b/LICENSE
index dd7b4f3..7c98f54 100644
--- a/LICENSE
+++ b/LICENSE
@@ -158,3 +158,32 @@ is explicitely stated in the header of every file.
 The GPL also contains some obligations. If you distribute netfilter/iptables code
 in binary form, you have to offer the source code, too.
 ===============================================================================
+
+===============================================================================
+Orbot also includes BadVPN tun2socks: https://github.com/ambrop72/badvpn
+
+Copyright (c) 2009, Ambroz Bizjak <ambrop7@xxxxxxxxx>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===============================================================================

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits