I've updated the branch to handle both ESR24 and ESR31 cases. I'm still working on it, in part because there's a weird bug with the popup menu where it only pops up on the second run of TBB.

In the medium term, it might be nice to fully adapt to the Australis style of popup panel. That probably means breaking backward compatibility, so perhaps that should wait until the ESR24 version is retired.

Ideally, if these are all the changes we need for FF31esr, this new Torbutton would still work on FF24esr, so we don't have to make a separate branch for the 31esr series.

#10716 makes the ESR 31 Torbutton incompatible with the ESR 24 one unless we do some version detection within Torbutton and or just ship both the old and the new logic (as the current patch does), a thing I'd like to avoid.

Ideally, if these are all the changes we need for FF31esr, this new Torbutton would still work on FF24esr, so we don't have to make a separate branch for the 31esr series.

#10716 makes the ESR 31 Torbutton incompatible with the ESR 24 one unless we do some version detection within Torbutton and or just ship both the old and the new logic (as the current patch does), a thing I'd like to avoid.

I can see good arguments both for and against using version detection. We could use version detection during the transition period bewteen ESRs and then delete code for ESR 24 after it's retired. What do you think? I'll post patches here for review once we've decided which way to go.