>> mainline for the 2.5 series?  I.e., sha2, argon2 seem like potential
>> options.
>
> +1 for pw-sha2 and pw-argon2.

sha2 is already obsolete, for password purposes. I see no reason to promote it.
>