This is an "ours" merge to avoid conflicts on the authority list: the 0.2.7 branch already has the tonga->bifroest merge.
Nick Mathewson