[tor-commits] [tor-browser-build/master] Bug 31932: Copy snowflake's license to the bundled data

[gk@xxxxxxxxxxxxxx]

commit 9b0d98a51abdbad31d131b768e09e9a0c98b3f15
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Fri Oct 11 20:07:14 2019 -0400

    Bug 31932: Copy snowflake's license to the bundled data
---
 projects/snowflake/build                           |  2 +-
 .../Licenses/PluggableTransports/LICENSE.SNOWFLAKE | 32 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/projects/snowflake/build b/projects/snowflake/build
index 5309318..76546d8 100644
--- a/projects/snowflake/build
+++ b/projects/snowflake/build
@@ -21,7 +21,7 @@ go build -ldflags '-s'
 cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %]
 
 cd ..
-cp -a README.md LICENSE $DOCSDIR
+cp -a README.md $DOCSDIR
 
 cd $distdir
 [% c('tar', {
diff --git a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.SNOWFLAKE b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.SNOWFLAKE
new file mode 100644
index 0000000..f700c98
--- /dev/null
+++ b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.SNOWFLAKE
@@ -0,0 +1,32 @@
+              This file contains the license for "Snowflake"
+     a free software project which provides a WebRTC pluggable transport.
+
+================================================================================
+Copyright (c) 2016, Serene Han, Arlo Breault
+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 names of the copyright owners 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 HOLDER 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.
+================================================================================

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