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

diff --cc peer.go
Simple merge

diff --cc receive.go
Simple merge

diff --cc send.go
Simple merge

diff --cc signal.go
index d8d7153bb4da52c690826dda22ce4058e6c8a01b,4d51bfaae098d4baaa350ce0479643a9160434bf..606da521f559fe376d9710dfa9591160aaa9e2cd
--- 1/signal.go
--- 2/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{}

diff --cc timers.go
Simple merge

diff --cc uapi.go
Simple merge