This reverts commit 91fd9292.

We've just merged stuff into our local devel, so merging from origin
here is completely wrong.

To do this we had to re-order some internal steps in a way that
doesn't matter.

Parts of it have already been done in earlier steps; the rest will be
clearer like this.

These steps are already done in the previous section ("Freeze").

A bugfix branch based on stable/testing that is merged into devel will
change its config/base_branch unless we make them diverge, which will
force a conflict instead, which is what we want.

... when we do *not* expect to merge the branch with local, un-pushed
changes. That way there's a bit less risk of merging in a version of
$BRANCH that is outdated.

We now ship the one bundled in the Tor Browser.

No commit message

No commit message