ircd/listener: return a fatal TLS alert for early rejected TLS clients

[solanum.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index dacf44c7a22ac1415cc2729a6744908627ec2937..2865bf9eb228887873e7bec312d398cd5cb96cb5 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,8 @@
 Aaron Sethman <androsyn@ratbox.org> androsyn <devnull@localhost>
 Alexander Færøy <ahf@0x90.dk> Alexander F?r?y <ahf@0x90.dk>
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@atheme.org>
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
+Ariadne Conill <ariadne@dereferenced.org> nenolod <devnull@localhost>
 Brett Greenham <taros@shadowircd.net> B.Greenham <taros@shadowircd.net>
 Chris Mills <chris@chrisam.net> TheChrisAM <chris@chrisam.net>
 Chris Mills <chris@chrisam.net> freenode!ChrisAM <chris@chrisam.net>
@@ -15,5 +18,5 @@ Valeriy Yatsko <dwr@shadowircd.net> <darkwire@darkwire.ru>
 Valeriy Yatsko <dwr@shadowircd.net> <darkwire@ircd-charybdis.ru>
 Valeriy Yatsko <dwr@shadowircd.net> <darkwire@sellcenter.ru>
 Valeriy Yatsko <dwr@shadowircd.net> <dwr@it-penza.org>
-William Pitcock <nenolod@dereferenced.org> <nenolod@atheme.org>
-William Pitcock <nenolod@dereferenced.org> nenolod <devnull@localhost>
+Christine Dodrill <shadow.h511@gmail.com> <quora@lavabit.com>
+Christine Dodrill <shadow.h511@gmail.com> <quorawings@gmail.com>