OK, let me see if I can summarize before doing anything irrevocable to the git repo.
We will continue to have master, and will now also have a long-lived "stable-3.1" branch.
On master, we can start by bumping the ASDF version number to 3.2.0.1, and we will continue to versioning until we get to our first 3.2 release, which will be 3.2.1.
We will continue to tag our versions as before.
Is this an accurate reflection of the consensus approach?