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

A handful of past contributors are recorded with multiple e-mail
addresses, all of which are undeliverable.  With a lot of help from
Jonathan, we located all of them except for one person, and a pair
of addresses we suspect belong to a single person but we are not
certain.

Update the found ones with their currently preferred address, and
use the last known address to consolidate contributions by the lost
one.

Helped-by: Stefan Beller <[email protected]>
Helped-by: Jonathan Nieder <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>

Author: gitster

.mailmap

@@ -18,6 +18,8 @@ Alexey Shumkin <[email protected]> <[email protected]>
 Anders Kaseorg <[email protected]> <[email protected]>
 Anders Kaseorg <[email protected]> <[email protected]>
 Aneesh Kumar K.V <[email protected]>
+Amos Waterland <[email protected]> <[email protected]>
+Amos Waterland <[email protected]> <[email protected]>
 Ben Walton <[email protected]> <[email protected]>
 Bernt Hansen <[email protected]> <[email protected]>
 Brandon Casey <[email protected]> <[email protected]>
@@ -34,6 +36,8 @@ Dan Johnson <[email protected]>
 Dana L. How <[email protected]> <[email protected]>
 Dana L. How <[email protected]> Dana How
 Daniel Barkalow <[email protected]>
+Daniel Trstenjak <[email protected]> <[email protected]>
+Daniel Trstenjak <[email protected]> <[email protected]>
 David Brown <[email protected]> <[email protected]>
 David D. Kilzer <[email protected]>
 David Kågedal <[email protected]>
@@ -68,11 +72,17 @@ J. Bruce Fields <[email protected]> <[email protected]>
 J. Bruce Fields <[email protected]> <[email protected]>
 Jakub Narębski <[email protected]>
 James Y Knight <[email protected]> <[email protected]>
+# The 2 following authors are probably the same person,
+# but both emails bounce.
+Jason McMullan <[email protected]>
+Jason McMullan <[email protected]>
 Jason Riedy <[email protected]> <[email protected]>
 Jason Riedy <[email protected]> <[email protected]>
 Jay Soffian <[email protected]> <[email protected]>
 Jeff King <[email protected]> <[email protected]>
 Jeff Muizelaar <[email protected]> <[email protected]>
+Jens Axboe <[email protected]> <[email protected]>
+Jens Axboe <[email protected]> <[email protected]>
 Jim Meyering <[email protected]> <[email protected]>
 Joachim Berdal Haga <[email protected]>
 Johannes Schindelin <[email protected]> <[email protected]>
@@ -144,7 +154,7 @@ Michele Ballabio <[email protected]>
 Miklos Vajna <[email protected]> <[email protected]>
 Namhyung Kim <[email protected]> <[email protected]>
 Namhyung Kim <[email protected]> <[email protected]>
-Nanako Shiraishi <[email protected]>
+Nanako Shiraishi <nanako3@lavabit.com> <nanako3@bluebottle.com>
 Nanako Shiraishi <[email protected]>
 Nelson Elhage <[email protected]> <[email protected]>
 Nelson Elhage <[email protected]> <[email protected]>
@@ -177,6 +187,8 @@ Robert Fitzsimons <[email protected]>
 Robert Shearman <[email protected]> <[email protected]>
 Robert Zeh <[email protected]>
 Robin Rosenberg <[email protected]> <[email protected]>
+Rutger Nijlunsing <[email protected]> <[email protected]>
+Rutger Nijlunsing <[email protected]> <[email protected]>
 Ryan Anderson <[email protected]> <[email protected]>
 Salikh Zakirov <[email protected]> <[email protected]>
 Sam Vilain <[email protected]> <[email protected]>