max / makeover

Reconcile the mnw mirror with the rebased 2.1.1 release mnw briefly held the pre-rebase release commits, and its git server refuses a non-fast-forward branch push, so the orphaned tip is merged in with -s ours. Tree is unchanged from 2fda975; this exists only so the public mirror can fast-forward onto the same history as astra and srht.