diff --git a/Makefile.am b/Makefile.am
index 49c910dcff52fb157c9a47d49fcf3612b90c449c..639f651f34c04c042cc1e66ca511d5f350b77650 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,8 @@
 # $Id$
-# Copyright 2002-2004 Roger Dingledine
-# Copyright 2004-2005 Roger Dingledine, Nick Mathewson
+# Copyright (c) 2001-2004, Roger Dingledine
+# Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 # See LICENSE for licensing information
 
-
 AUTOMAKE_OPTIONS = foreign
  # else it keeps trying to put COPYING back in
 
diff --git a/configure.in b/configure.in
index d9a70147fbd3fe821ba789fe1cbf36e6cf580b60..8e09cfad3f1943b894c386be94be46c1fb207283 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl $Id$
-dnl Copyright (c) 2001-2005 Roger Dingledine
-dnl Copyright (c) 2004-2005 Nick Mathewson
+dnl Copyright (c) 2001-2004, Roger Dingledine
+dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl See LICENSE for licensing information
 
 AC_INIT
diff --git a/src/common/aes.c b/src/common/aes.c
index 300fea26720ec0cda3456d8259e1b3d18ac926ab..a0c759dc46455bfc42a016aeb3dd260e47474f63 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -1,5 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char aes_c_id[] = "$Id$";
diff --git a/src/common/aes.h b/src/common/aes.h
index d8f1f177eb86a4c15e9147e24f640666fac527ae..30606095b1e74ccd1825d0dbc64e1a9620c9ea58 100644
--- a/src/common/aes.h
+++ b/src/common/aes.h
@@ -1,5 +1,5 @@
 /* Copyright 2003 Roger Dingledine
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/compat.c b/src/common/compat.c
index 0d9de300a5ff95ea485a397729ba15994c72eb6b..477804a78994c038dc5c4281790bec64f27659bf 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1,5 +1,5 @@
 /* Copyright 2003-2004 Roger Dingledine
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char compat_c_id[] =
diff --git a/src/common/compat.h b/src/common/compat.h
index 0f13134f6d6bdd1fc1ee97e1ddf801177076b708..417b40c1360572c8632992a0fbde1ee3f863b4b9 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -1,5 +1,5 @@
 /* Copyright 2003-2004 Roger Dingledinex
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/container.c b/src/common/container.c
index 8f2fb6f73637de653888b6faf1bf570cdaa3ef99..33a77cd42c51a27d3b3972e3f63a35451a6b3e24 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -1,5 +1,5 @@
 /* Copyright 2003-2004 Roger Dingledine
-   Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+   Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char container_c_id[] =
diff --git a/src/common/container.h b/src/common/container.h
index 3eb05857e050d1cf8987d05f4a1a997709dfe15f..83c0f28229fbd953d1f7220b0e1f1616f5de7ddf 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -1,5 +1,5 @@
 /* Copyright 2003-2004 Roger Dingledine
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/crypto.c b/src/common/crypto.c
index b3f53589c084f00cc5c1c477035d4bd0b2d13282..43bbaa3752d2727bf5061f4a29c6815fdb730be2 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1,5 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char crypto_c_id[] =
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 02f9814118bcd7c76944732551031784fc239676..160cc5d57c5630390210f343eec2bf4d97156e45 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -1,5 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/log.c b/src/common/log.c
index 2524d5cc21a09f2e63b9dee1ccb08ff32d32d4b5..3ed788f499bea59fec21dc7bb1e371d2abfaa36a 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -1,5 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char log_c_id[] = "$Id$";
diff --git a/src/common/log.h b/src/common/log.h
index 852460b4bc2955f2b362ba3ea240057cab37ad1b..785b6c55679b04e07639656b2b09a88b5cd6ea7b 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -1,5 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/test.h b/src/common/test.h
index 99abc0b5a4eec1f0e51896994dadd6af658312e0..56e0222724b95d287feac48d0a1768d5f1a3d8f6 100644
--- a/src/common/test.h
+++ b/src/common/test.h
@@ -1,5 +1,5 @@
 /* Copyright 2001,2002,2003 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index 31ca8f6161530bc719e83343f7e54832994b2dd5..ecfbf2ba7821c59194391213ce55b7eb1c1b2a48 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -1,5 +1,5 @@
 /* Copyright 2004 Roger Dingledine */
-/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+/* Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char torgzip_c_id[] =
diff --git a/src/common/torgzip.h b/src/common/torgzip.h
index a70463be6c873e154b94ef42b45ddfcf99877605..36d96940a02b584e425ebf60be9b5fbb648e9233 100644
--- a/src/common/torgzip.h
+++ b/src/common/torgzip.h
@@ -1,5 +1,5 @@
 /* Copyright 2003 Roger Dingledine
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/torint.h b/src/common/torint.h
index baaca80b702b76697079f267fbb5e70b04ac3020..ecb4f769f8e3302d620b413d363e9661e7031ed6 100644
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@ -1,5 +1,5 @@
 /* Copyright 2003 Roger Dingledine
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/tortls.c b/src/common/tortls.c
index fa5d878415f580026fdeb5eb083505d6479cce7a..f7815900a5bb0210beaf0caa7ae90f435f0f7ff8 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1,5 +1,5 @@
 /* Copyright 2003 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char tortls_c_id[] =
diff --git a/src/common/tortls.h b/src/common/tortls.h
index 95545fe97f75ab8e901061dd6bea3704132e2c93..9add9c7cea9e0009a092dceacca34b4dc6be6bea 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -1,5 +1,5 @@
 /* Copyright 2003 Roger Dingledine
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/util.c b/src/common/util.c
index caa7c476750599bfce7657ce59833c39a9a42029..37093b26c5963966933ac83d0ea5b0a95f235de0 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1,5 +1,5 @@
 /* Copyright 2003 Roger Dingledine
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char util_c_id[] = "$Id$";
diff --git a/src/common/util.h b/src/common/util.h
index bb127da5596cedccbb7f7eb72aab10116a54934f..90e7eeb29f8f9ef9bf1fbc612a1e274b46eb3e23 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -1,5 +1,5 @@
 /* Copyright 2003-2004 Roger Dingledine
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 3e2a2b1a86ded8a3c21d1f280fc7ead0ae89a687..0a1c3de8d1bcd155cb116bf36281a9b089264eb2 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char buffers_c_id[] =
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 2a484a13e1b97714dee1e679601e5b7338163706..83a7eb5224d4f2826da58230e69053ea12abd506 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuitbuild_c_id[] =
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 6f5fc26c6892cb2085133b162200e6ac50ecb1d1..9001b07d8d9763a01ccd33887793fb2f793f7d4c 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuitlist_c_id[] =
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index f7af0f0f5f0848028d8a638fe5fc9ee2d3de3091..a3b356a512114d3a8d4cf0ce259afdb22fad4009 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuituse_c_id[] =
diff --git a/src/or/command.c b/src/or/command.c
index 49a9a8f6a7f9789667248d789b5eedfbe22bc99d..16a3efc1ab26039658cdec17b5057421780e2fe3 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char command_c_id[] =
diff --git a/src/or/config.c b/src/or/config.c
index 1b384789eac5e74bb43a0ae6d4fdd97e54faafc0..d7003824656ebb0c6e5d5d9c91da2268b43480b9 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char config_c_id[] = \
diff --git a/src/or/connection.c b/src/or/connection.c
index ecdb4dbeb39972c9acdb04af314156a3fe461d6f..bb993ca43d0e4e53b3bab3937c13b1d5105cc8b0 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_c_id[] =
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 29dcac32c2f6b04c1e4694c32da692badfbe4e12..a38984ab77ad7039bde63bb3399969bc21d0f091 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_edge_c_id[] =
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 4216ca40707c596ded89fd9252f2d98f8efd5374..a58abc5870e34483d9671f4e9f8d1d5014d6afa0 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_or_c_id[] =
diff --git a/src/or/control.c b/src/or/control.c
index 0f40e4d8a3e49bf200a614a5b248d414f37f6e3d..287550549c7aae6bc621c38fda1a305e6ab00020 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1,4 +1,4 @@
-/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char control_c_id[] =
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index ad07852530a10c58e99493483f5837e54503351b..69d3919559c13bece75fe43b72e172bb92a2380a 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -1,5 +1,5 @@
 /* Copyright 2003-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char cpuworker_c_id[] =
diff --git a/src/or/directory.c b/src/or/directory.c
index 1c93f49e182b1b2a1e0c57527a689ad3200ef70c..23fc62deefa1840380b8e29457418e5fdd758210 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1,5 +1,5 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char directory_c_id[] =
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index a9c542a7b4c5b73370ef9e1a54123e9327c315f6..1b068b9ed2238504cf5c98ddfde642b8d45d0184 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1,5 +1,5 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dirserv_c_id[] =
diff --git a/src/or/dns.c b/src/or/dns.c
index ce63d783bb7f388e7921ec39f1ddc4f256dff19e..e43129490554a343f11083161577398543c205a2 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1,5 +1,5 @@
 /* Copyright 2003-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dns_c_id[] =
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 80f2e48dc6bc5463cf35891653212dcd2bb64ccc..aa26dca75d69a649bb0a3e0592db1a77ace1f7a5 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -1,4 +1,4 @@
-/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char hibernate_c_id[] =
diff --git a/src/or/main.c b/src/or/main.c
index f3d4b1fb1b79b706547d9f964ef6bf58c0cedd87..47da30ee209c3ae7df2547d282831e90d14c7c29 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char main_c_id[] =
diff --git a/src/or/onion.c b/src/or/onion.c
index ba50f2a01560e222bcba07dabd7da5dd4ecc835f..ecf0bcc24a37e1f9191180a8360354c2a795c2b6 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char onion_c_id[] =
diff --git a/src/or/or.h b/src/or/or.h
index 0ef7e00e429e07dda4b16cdce0b8c3aee30da017..680a0fb1a36119af793d1cbd28f482fa3c1eb110 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/relay.c b/src/or/relay.c
index cd3f224325188864c7e7d83054304604a5c1fab4..1c308f1f55e3fde28796b08e3349ba2d96eb6435 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char relay_c_id[] =
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 1ab8ed5bae064aab7bc720bea7c61d98e6f30898..dfb51861041e3e1dbb735c9639f6063b29cc4d02 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -1,4 +1,4 @@
-/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendclient_c_id[] =
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 1aacf8ba6f66617ded53b12df1cdd5a57c8afdea..1e0fb8af1d3e269e1feb5ab12692962bf0126e81 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendcommon_c_id[] =
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 73b6c8064d867b6d214f88c185cf18dc4c9ae393..fd2c66d235ddd1e929352735d5143da304c2c449 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -1,4 +1,4 @@
-/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendmid_c_id[] =
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 520074bb48b633e86e30b929cd6bb8e1fda7dcef..a9f9c9d1d8bfdabeec4d82152bddfa09274c2c75 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1,4 +1,4 @@
-/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendservice_c_id[] =
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 4540cfeca0ba81de9908293aef22c0b3f00522c7..9e7c2e5a910ed6c5d0b87650d7613d85d31c9a54 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1,4 +1,4 @@
-/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rephist_c_id[] =
diff --git a/src/or/router.c b/src/or/router.c
index 754f6c2280713a22e693a6619e2f8a63b7b9cb1b..bf8a36ab93f0b0d75f01226e3b8c51b0c62e5d0b 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char router_c_id[] =
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 61ff58f8714cea812a911812e52cf0a6c630f24f..f9e7e7d720cf3668362a293d4e670c8c2e4324f3 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char routerlist_c_id[] =
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 61de43fcaee7a811aa3ef2db5da66250cd0d44c3..a5abae3fda10d556386612e90912368d8033af5f 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1,6 +1,6 @@
-/* Copyright 2001 Matej Pfajfar.
- * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char routerparse_c_id[] =
diff --git a/src/or/test.c b/src/or/test.c
index 053a3ba153b9f90d621f97026f14a5a1e4a2f273..48bac48e9a97e97acc35ac03b4274dc172e0ce92 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1,5 +1,5 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char test_c_id[] =
diff --git a/src/or/tor_main.c b/src/or/tor_main.c
index 0fa5f003848bf713f4e8901b8c6a73cd9fe49c40..2585aee9398dc4cf594f20cfba65341bdf2ea0ad 100644
--- a/src/or/tor_main.c
+++ b/src/or/tor_main.c
@@ -1,5 +1,5 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2006 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char tor_main_c_id[] =