.mailmap: update long-lost friends with multiple defunct addresses