Merging upstream changes

As always, you can find the changelog, straight from the horse's mouth, over here:

https://cvsweb.openbsd.org/src/usr.bin/mg/?sortby=date#dirlist