Merge proposals

tinc in Ubuntu has no merge proposals.