]> git.ipfire.org Git - thirdparty/wireguard-go.git/commitdiff
Merge branch 'master' of ssh://git.zx2c4.com/wireguard-go
authorMathias Hall-Andersen <mathias@hall-andersen.dk>
Sat, 5 May 2018 20:10:22 +0000 (22:10 +0200)
committerMathias Hall-Andersen <mathias@hall-andersen.dk>
Sat, 5 May 2018 20:10:22 +0000 (22:10 +0200)
1  2 
receive.go
send.go

diff --cc receive.go
Simple merge
diff --cc send.go
Simple merge