From 672023f9f27555be9e5f993e000cb58da4fcd76b Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Wed, 14 Jul 2021 12:31:14 -0700
Subject: [PATCH] doc: update mailmap and deduplicate AUTHORS entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/39391
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Zeyu Yang <himself65@outlook.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
---
 .mailmap | 2 ++
 AUTHORS  | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index c63bd511e6b5d9..b7927d840cfe7c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -162,6 +162,8 @@ Hendrik Schwalm <mail@hendrikschwalm.de> hschwalm <mail@hendrikschwalm.de>
 Hitesh Kanwathirtha <hiteshk@microsoft.com> <digitalinfinity@gmail.com>
 Henry Chin <hheennrryy@gmail.com>
 Herbert Vojčík <herby@mailbox.sk>
+himself65 <himself65@mask.io> <himself6565@gmail.com>
+himself65 <himself65@mask.io> <himself65@outlook.com>
 Icer Liang <liangshuangde@163.com> <wizicer@users.noreply.github.com>
 Igor Savin <iselwin@gmail.com> kibertoad <iselwin@gmail.com>
 Igor Soarez <igorsoarez@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 06db580eb294ad..38e67e18f3b3d9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2682,7 +2682,7 @@ Alexander Sattelmaier <alexander.sattelmaier@gmail.com>
 Avi ד <avi.the.coder@gmail.com>
 Thomas <hakerh403@gmail.com>
 Aymen Naghmouchi <aymen.aymen@live.it>
-himself65 <himself6565@gmail.com>
+himself65 <himself65@mask.io>
 Geir Hauge <geir.hauge@gmail.com>
 Patrick Gansterer <paroga@paroga.com>
 Nicolas Moteau <nicolas.moteau@orange.com>
@@ -2740,7 +2740,6 @@ Alba Mendez <me@alba.sh>
 zero1five <zerodengyin@gmail.com>
 Gaelan <gbs@canishe.com>
 Jacob <jacobq@gmail.com>
-himself65 <himself65@outlook.com>
 Dan Beglin <dbeglinuk@gmail.com>
 Anish Asrani <anishasrani@gmail.com>
 teams2ua <teams2ua@gmail.com>