Rollup merge of #67664 - Manishearth:mailmapfixes, r=Mark-Simulacrum
Rollup merge of #67664 - Manishearth:mailmapfixes, r=Mark-Simulacrum

Fix some mailmap entries

r? @pietroalbini

graydon/rust,aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,graydon/rust,graydon/rust,aidancully/rust,aidancully/rust,aidancully/rust