Merging more s2s

Partial s2s commit

s2s works! \o/ \o/ s2s

working incoming s2s \o/ s2s

working outgoing s2s \o/ s2s

dialback keys now verified s2s

No need to comment out s2s in this branch s2s

(0) -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 tip

mercurial