Change my email address to eagle@eyrie.org

Change-Id: I4c2b5d7c807d6c27dd18a3b92eef66d21287d21e
Reviewed-on: https://gerrit.stanford.edu/1481
Reviewed-by: Russ Allbery <rra@stanford.edu>
Tested-by: Russ Allbery <rra@stanford.edu>

38 files changed, 45 insertions, 45 deletions

diff --git a/tests/HOWTO b/tests/HOWTO
index 5d38748..b94985d 100644
--- a/tests/HOWTO
+++ b/tests/HOWTO
@@ -240,7 +240,7 @@ License
     This file is part of the documentation of C TAP Harness, which can be
     found at <http://www.eyrie.org/~eagle/software/c-tap-harness/>.
 
-    Copyright 2010 Russ Allbery <rra@stanford.edu>
+    Copyright 2010 Russ Allbery <eagle@eyrie.org>
 
     Copying and distribution of this file, with or without modification,
     are permitted in any medium without royalty provided the copyright
diff --git a/tests/client/basic-t.in b/tests/client/basic-t.in
index 836f394..974b636 100644
--- a/tests/client/basic-t.in
+++ b/tests/client/basic-t.in
@@ -2,7 +2,7 @@
 #
 # Test suite for the wallet command-line client.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2006, 2007, 2008, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/client/full-t.in b/tests/client/full-t.in
index ebdba03..4db0dbd 100644
--- a/tests/client/full-t.in
+++ b/tests/client/full-t.in
@@ -2,7 +2,7 @@
 #
 # End-to-end tests for the wallet client.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2008, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/client/prompt-t.in b/tests/client/prompt-t.in
index 06991cc..566d1a4 100644
--- a/tests/client/prompt-t.in
+++ b/tests/client/prompt-t.in
@@ -2,7 +2,7 @@
 #
 # Password prompting tests for the wallet client.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2008, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/client/rekey-t.in b/tests/client/rekey-t.in
index c6d0e41..c93b8eb 100644
--- a/tests/client/rekey-t.in
+++ b/tests/client/rekey-t.in
@@ -2,7 +2,7 @@
 #
 # Test suite for the wallet-rekey command-line client.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2006, 2007, 2008, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/data/cmd-fake b/tests/data/cmd-fake
index 11791a6..f889edd 100755
--- a/tests/data/cmd-fake
+++ b/tests/data/cmd-fake
@@ -3,7 +3,7 @@
 # This is a fake wallet backend that returns bogus data for verification by
 # the client test suite.  It doesn't test any of the wallet server code.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2007, 2008, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/data/fake-kadmin b/tests/data/fake-kadmin
index c073ea5..57f9c97 100755
--- a/tests/data/fake-kadmin
+++ b/tests/data/fake-kadmin
@@ -2,7 +2,7 @@
 #
 # Fake kadmin.local used to test the keytab backend.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2007
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/docs/pod-spelling-t b/tests/docs/pod-spelling-t
index e1a95cd..1a02af8 100755
--- a/tests/docs/pod-spelling-t
+++ b/tests/docs/pod-spelling-t
@@ -7,7 +7,7 @@
 # The canonical version of this file is maintained in the rra-c-util package,
 # which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2012, 2013
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/docs/pod-t b/tests/docs/pod-t
index 2743287..6918271 100755
--- a/tests/docs/pod-t
+++ b/tests/docs/pod-t
@@ -6,7 +6,7 @@
 # The canonical version of this file is maintained in the rra-c-util package,
 # which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2012, 2013
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/portable/asprintf-t.c b/tests/portable/asprintf-t.c
index 4513a85..c61c14a 100644
--- a/tests/portable/asprintf-t.c
+++ b/tests/portable/asprintf-t.c
@@ -4,7 +4,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
  *
  * The authors hereby relinquish any claim to any copyright that they may have
  * in this work, whether granted under contract or by operation of law or
diff --git a/tests/portable/mkstemp-t.c b/tests/portable/mkstemp-t.c
index 98c708e..20a83fc 100644
--- a/tests/portable/mkstemp-t.c
+++ b/tests/portable/mkstemp-t.c
@@ -4,7 +4,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
  *
  * The authors hereby relinquish any claim to any copyright that they may have
  * in this work, whether granted under contract or by operation of law or
diff --git a/tests/portable/setenv-t.c b/tests/portable/setenv-t.c
index a1aecb5..15ed1fd 100644
--- a/tests/portable/setenv-t.c
+++ b/tests/portable/setenv-t.c
@@ -4,7 +4,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
  *
  * The authors hereby relinquish any claim to any copyright that they may have
  * in this work, whether granted under contract or by operation of law or
diff --git a/tests/portable/snprintf-t.c b/tests/portable/snprintf-t.c
index 927de96..270d2e1 100644
--- a/tests/portable/snprintf-t.c
+++ b/tests/portable/snprintf-t.c
@@ -4,9 +4,9 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
  * Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006
- *     Russ Allbery <rra@stanford.edu>
+ *     Russ Allbery <eagle@eyrie.org>
  * Copyright 2009, 2010
  *     The Board of Trustees of the Leland Stanford Junior University
  * Copyright 1995 Patrick Powell
diff --git a/tests/portable/strlcat-t.c b/tests/portable/strlcat-t.c
index 54d0d40..58aba58 100644
--- a/tests/portable/strlcat-t.c
+++ b/tests/portable/strlcat-t.c
@@ -4,7 +4,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
  *
  * The authors hereby relinquish any claim to any copyright that they may have
  * in this work, whether granted under contract or by operation of law or
diff --git a/tests/portable/strlcpy-t.c b/tests/portable/strlcpy-t.c
index 26aa8f2..6652a7c 100644
--- a/tests/portable/strlcpy-t.c
+++ b/tests/portable/strlcpy-t.c
@@ -4,7 +4,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
  *
  * The authors hereby relinquish any claim to any copyright that they may have
  * in this work, whether granted under contract or by operation of law or
diff --git a/tests/runtests.c b/tests/runtests.c
index 4249875..3756aa6 100644
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -55,7 +55,7 @@
  * Harness <http://www.eyrie.org/~eagle/software/c-tap-harness/>.
  *
  * Copyright 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011
- *     Russ Allbery <rra@stanford.edu>
+ *     Russ Allbery <eagle@eyrie.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/tests/server/admin-t b/tests/server/admin-t
index 6846609..3c80d81 100755
--- a/tests/server/admin-t
+++ b/tests/server/admin-t
@@ -2,7 +2,7 @@
 #
 # Tests for the wallet-admin dispatch code.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2008, 2009, 2010, 2011
 #     The Board of Trustees of the Leland Stanford Junior University
 #
@@ -140,7 +140,7 @@ seek (STDIN, 0, 0);
 ($out, $err) = run_admin ('initialize', 'rra');
 is ($err, "invalid admin principal rra\n", 'Initialize requires a principal');
 is ($out, "new\n", ' and nothing was run');
-($out, $err) = run_admin ('initialize', 'rra@stanford.edu');
+($out, $err) = run_admin ('initialize', 'eagle@eyrie.org');
 is ($err, '', 'Initialize succeeds with a principal');
 is ($out, "new\ninitialize rra\@stanford.edu\n", ' and runs the right code');
 
@@ -170,7 +170,7 @@ is ($err, "some error\n", 'Error handling succeeds for destroy');
 is ($out, "new\n"
     . 'This will delete all data in the wallet database.'
     . '  Are you sure (N/y)? ' . "destroy\n", ' and calls the right methods');
-($out, $err) = run_admin ('initialize', 'rra@stanford.edu');
+($out, $err) = run_admin ('initialize', 'eagle@eyrie.org');
 is ($err, "some error\n", 'Error handling succeeds for initialize');
 is ($out, "new\ninitialize rra\@stanford.edu\n",
     ' and calls the right methods');
diff --git a/tests/server/backend-t b/tests/server/backend-t
index 7e9287d..f3c926a 100755
--- a/tests/server/backend-t
+++ b/tests/server/backend-t
@@ -2,7 +2,7 @@
 #
 # Tests for the wallet-backend dispatch code.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/server/keytab-t b/tests/server/keytab-t
index a9f5450..94c1bd8 100755
--- a/tests/server/keytab-t
+++ b/tests/server/keytab-t
@@ -2,7 +2,7 @@
 #
 # Tests for the keytab-backend dispatch code.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2006, 2007, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/server/report-t b/tests/server/report-t
index 43ec9d1..ad05363 100755
--- a/tests/server/report-t
+++ b/tests/server/report-t
@@ -2,7 +2,7 @@
 #
 # Tests for the wallet-report dispatch code.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2008, 2009, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/tap/basic.c b/tests/tap/basic.c
index e8196fc..70ee093 100644
--- a/tests/tap/basic.c
+++ b/tests/tap/basic.c
@@ -12,7 +12,7 @@
  * This file is part of C TAP Harness.  The current version plus supporting
  * documentation is at <http://www.eyrie.org/~eagle/software/c-tap-harness/>.
  *
- * Copyright 2009, 2010, 2011, 2012 Russ Allbery <rra@stanford.edu>
+ * Copyright 2009, 2010, 2011, 2012 Russ Allbery <eagle@eyrie.org>
  * Copyright 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2011, 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
diff --git a/tests/tap/basic.h b/tests/tap/basic.h
index fa4adaf..c55f662 100644
--- a/tests/tap/basic.h
+++ b/tests/tap/basic.h
@@ -4,7 +4,7 @@
  * This file is part of C TAP Harness.  The current version plus supporting
  * documentation is at <http://www.eyrie.org/~eagle/software/c-tap-harness/>.
  *
- * Copyright 2009, 2010, 2011, 2012 Russ Allbery <rra@stanford.edu>
+ * Copyright 2009, 2010, 2011, 2012 Russ Allbery <eagle@eyrie.org>
  * Copyright 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2011, 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
diff --git a/tests/tap/kerberos.c b/tests/tap/kerberos.c
index 474cf4f..6f593f8 100644
--- a/tests/tap/kerberos.c
+++ b/tests/tap/kerberos.c
@@ -14,7 +14,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
  * Copyright 2006, 2007, 2009, 2010, 2011, 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
diff --git a/tests/tap/kerberos.h b/tests/tap/kerberos.h
index 31b6343..25c44a6 100644
--- a/tests/tap/kerberos.h
+++ b/tests/tap/kerberos.h
@@ -4,7 +4,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
  * Copyright 2006, 2007, 2009, 2011, 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
diff --git a/tests/tap/kerberos.sh b/tests/tap/kerberos.sh
index d2f174d..e970ae5 100644
--- a/tests/tap/kerberos.sh
+++ b/tests/tap/kerberos.sh
@@ -8,7 +8,7 @@
 # The canonical version of this file is maintained in the rra-c-util package,
 # which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2009, 2010, 2011, 2012
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/tap/libtap.sh b/tests/tap/libtap.sh
index f9347d8..1b02939 100644
--- a/tests/tap/libtap.sh
+++ b/tests/tap/libtap.sh
@@ -9,8 +9,8 @@
 # writing test cases.  It is part of C TAP Harness, which can be found at
 # <http://www.eyrie.org/~eagle/software/c-tap-harness/>.
 #
-# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2009, 2010, 2011, 2012 Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
+# Copyright 2009, 2010, 2011, 2012 Russ Allbery <eagle@eyrie.org>
 # Copyright 2006, 2007, 2008
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/tap/macros.h b/tests/tap/macros.h
index 33fee42..368f95e 100644
--- a/tests/tap/macros.h
+++ b/tests/tap/macros.h
@@ -8,7 +8,7 @@
  * This file is part of C TAP Harness.  The current version plus supporting
  * documentation is at <http://www.eyrie.org/~eagle/software/c-tap-harness/>.
  *
- * Copyright 2008, 2012 Russ Allbery <rra@stanford.edu>
+ * Copyright 2008, 2012 Russ Allbery <eagle@eyrie.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/tests/tap/messages.c b/tests/tap/messages.c
index abc2c49..3754d18 100644
--- a/tests/tap/messages.c
+++ b/tests/tap/messages.c
@@ -8,7 +8,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2002, 2004, 2005 Russ Allbery <rra@stanford.edu>
+ * Copyright 2002, 2004, 2005 Russ Allbery <eagle@eyrie.org>
  * Copyright 2006, 2007, 2009, 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
diff --git a/tests/tap/messages.h b/tests/tap/messages.h
index 0544f2d..985b9cd 100644
--- a/tests/tap/messages.h
+++ b/tests/tap/messages.h
@@ -4,7 +4,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2002 Russ Allbery <rra@stanford.edu>
+ * Copyright 2002 Russ Allbery <eagle@eyrie.org>
  * Copyright 2006, 2007, 2009
  *     The Board of Trustees of the Leland Stanford Junior University
  *
diff --git a/tests/tap/process.c b/tests/tap/process.c
index 8ed4cfd..ac60aae 100644
--- a/tests/tap/process.c
+++ b/tests/tap/process.c
@@ -10,8 +10,8 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
- * Copyright 2002, 2004, 2005 Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
+ * Copyright 2002, 2004, 2005 Russ Allbery <eagle@eyrie.org>
  * Copyright 2009, 2010, 2011
  *     The Board of Trustees of the Leland Stanford Junior University
  *
diff --git a/tests/tap/process.h b/tests/tap/process.h
index df74b5f..ed90345 100644
--- a/tests/tap/process.h
+++ b/tests/tap/process.h
@@ -4,7 +4,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
  * Copyright 2009, 2010
  *     The Board of Trustees of the Leland Stanford Junior University
  *
diff --git a/tests/tap/remctl.sh b/tests/tap/remctl.sh
index 2fd6681..0a511a0 100644
--- a/tests/tap/remctl.sh
+++ b/tests/tap/remctl.sh
@@ -8,7 +8,7 @@
 # The canonical version of this file is maintained in the rra-c-util package,
 # which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
 #
-# Written by Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
 # Copyright 2009, 2012
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/tap/string.c b/tests/tap/string.c
index f5c965c..6ed7e68 100644
--- a/tests/tap/string.c
+++ b/tests/tap/string.c
@@ -7,7 +7,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2011, 2012 Russ Allbery <rra@stanford.edu>
+ * Copyright 2011, 2012 Russ Allbery <eagle@eyrie.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/tests/tap/string.h b/tests/tap/string.h
index 2f699e4..cc51945 100644
--- a/tests/tap/string.h
+++ b/tests/tap/string.h
@@ -7,7 +7,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2011, 2012 Russ Allbery <rra@stanford.edu>
+ * Copyright 2011, 2012 Russ Allbery <eagle@eyrie.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/tests/util/messages-krb5-t.c b/tests/util/messages-krb5-t.c
index e3ffe75..8e9daf1 100644
--- a/tests/util/messages-krb5-t.c
+++ b/tests/util/messages-krb5-t.c
@@ -4,7 +4,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
  * Copyright 2010, 2011
  *     The Board of Trustees of the Leland Stanford Junior University
  *
diff --git a/tests/util/messages-t.c b/tests/util/messages-t.c
index 54f1cf1..f60fa6a 100644
--- a/tests/util/messages-t.c
+++ b/tests/util/messages-t.c
@@ -4,8 +4,8 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Written by Russ Allbery <rra@stanford.edu>
- * Copyright 2002, 2004, 2005 Russ Allbery <rra@stanford.edu>
+ * Written by Russ Allbery <eagle@eyrie.org>
+ * Copyright 2002, 2004, 2005 Russ Allbery <eagle@eyrie.org>
  * Copyright 2009, 2010, 2011, 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
diff --git a/tests/util/xmalloc-t b/tests/util/xmalloc-t
index b6c6dfd..74e4bbd 100755
--- a/tests/util/xmalloc-t
+++ b/tests/util/xmalloc-t
@@ -5,8 +5,8 @@
 # The canonical version of this file is maintained in the rra-c-util package,
 # which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
 #
-# Written by Russ Allbery <rra@stanford.edu>
-# Copyright 2000, 2001, 2006 Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <eagle@eyrie.org>
+# Copyright 2000, 2001, 2006 Russ Allbery <eagle@eyrie.org>
 # Copyright 2008, 2009, 2010, 2012
 #     The Board of Trustees of the Leland Stanford Junior University
 #
diff --git a/tests/util/xmalloc.c b/tests/util/xmalloc.c
index 394cab5..6614586 100644
--- a/tests/util/xmalloc.c
+++ b/tests/util/xmalloc.c
@@ -4,7 +4,7 @@
  * The canonical version of this file is maintained in the rra-c-util package,
  * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
- * Copyright 2000, 2001, 2006 Russ Allbery <rra@stanford.edu>
+ * Copyright 2000, 2001, 2006 Russ Allbery <eagle@eyrie.org>
  * Copyright 2008, 2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *