Merge branch 'port-2021-06-28' into 'master'

Port 2021 06 28

See merge request p2p/go-addr-util!1
2 jobs for v0.0.1 in 33 seconds (queued for 8 seconds)
Status Job ID Name Coverage
  Build
passed #2350
testing
build

00:00:20

 
  Test
passed #2351
testing
test

00:00:13

91.5%