From: Mathias Hall-Andersen <mathias@hall-andersen.dk>
Date: Sat, 5 May 2018 00:23:03 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.zx2c4.com/wireguard-go
X-Git-Tag: 0.0.20180514~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edbce6b400250f764d3b9f38ecfc7bb29adbd967;p=thirdparty%2Fwireguard-go.git

Merge branch 'master' of ssh://git.zx2c4.com/wireguard-go
---

edbce6b400250f764d3b9f38ecfc7bb29adbd967
diff --cc signal.go
index d8d7153,4d51bfa..606da52
--- a/signal.go
+++ b/signal.go
@@@ -1,12 -1,10 +1,17 @@@
+ /* SPDX-License-Identifier: GPL-2.0
+  *
+  * Copyright (C) 2017-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+  */
+ 
  package main
  
 +func signalSend(s chan<- struct{}) {
 +	select {
 +	case s <- struct{}{}:
 +	default:
 +	}
 +}
 +
  type Signal struct {
  	enabled AtomicBool
  	C       chan struct{}