Impl: generalise §4 to incorporate §10

[csperkins]

The rendezvous and discovery steps described in Section 10 for peer-to-peer connection establishment are a generalisation of those in Section 4. Need to discuss in London how we can combine these as a single algorithm that works for both cases.

[tfpauly]

Closing as OBE