[tor-commits] [tor-browser-bundle/master] Include the Go license as required for certain PTs.

[gk at torproject.org]

commit 2326062d5c514ee4ce45783b1ff05af6eadfdb52
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Tue Sep 2 14:49:59 2014 +0000

    Include the Go license as required for certain PTs.
    
    Go license taken from http://golang.org/LICENSE?m=text
    
    Fixes bug #13039.
---
 .../Docs/Licenses/PluggableTransports/LICENSE      |    9 +++++++
 .../Docs/Licenses/PluggableTransports/LICENSE.GO   |   27 ++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE b/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE
index 162589c..749986b 100644
--- a/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE
+++ b/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE
@@ -13,6 +13,15 @@ file LICENSE.PYTHON.
 
 ===============================================================================
 
+Go
+
+Some pluggable transports are written in Go and the binary packages include
+parts of the Go runtime library. A copy of the Go license (which itself
+includes the licenses of some of Go's components) is included in the file
+LICENSE.GO.
+
+===============================================================================
+
 OpenSSL
 
 (From http://openssl.org/source/license.html.)
diff --git a/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.GO b/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.GO
new file mode 100644
index 0000000..7448756
--- /dev/null
+++ b/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.GO
@@ -0,0 +1,27 @@
+Copyright (c) 2012 The Go Authors. 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 Google Inc. 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 COPYRIGHT
+OWNER OR CONTRIBUTORS 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.