Merge branch 'port-2021-07-02'

2 jobs for master in 10 seconds (queued for 1 minute and 11 seconds)
Status Job ID Name Coverage
  Build
passed #2334
testing
build

00:00:05

 
  Test
failed #2335
testing
test

00:00:04

 
Name Stage Failure
failed
test Test
		have SecureInbound(context.Context, net.Conn) (sec.SecureConn, error)
want SecureInbound(context.Context, net.Conn) (sec.SecureConn, bool, error)
./websocket_test.go:51:3: cannot use insecure.New("peerB") (type *insecure.Transport) as type sec.SecureMuxer in field value:
*insecure.Transport does not implement sec.SecureMuxer (wrong type for SecureInbound method)
have SecureInbound(context.Context, net.Conn) (sec.SecureConn, error)
want SecureInbound(context.Context, net.Conn) (sec.SecureConn, bool, error)
FAIL gitlab.dms3.io/p2p/go-ws-transport [build failed]
Cleaning up file based variables
ERROR: Job failed: exit status 1