Server creates a conn object and sends it over a channel to peer
Merge remote-tracking branch 'origin/master'