Happy new year!

svn:r5949

49 files changed, 92 insertions, 88 deletions

diff --git a/Makefile.am b/Makefile.am
index 49c910dcff..639f651f34 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 d9a70147fb..8e09cfad3f 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 300fea2672..a0c759dc46 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 d8f1f177eb..30606095b1 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 0d9de300a5..477804a789 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 0f13134f6d..417b40c136 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 8f2fb6f736..33a77cd42c 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 3eb05857e0..83c0f28229 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 b3f53589c0..43bbaa3752 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 02f9814118..160cc5d57c 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 2524d5cc21..3ed788f499 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 852460b4bc..785b6c5567 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 99abc0b5a4..56e0222724 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 31ca8f6161..ecfbf2ba78 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 a70463be6c..36d96940a0 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 baaca80b70..ecb4f769f8 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 fa5d878415..f7815900a5 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 95545fe97f..9add9c7cea 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 caa7c47675..37093b26c5 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 bb127da559..90e7eeb29f 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 3e2a2b1a86..0a1c3de8d1 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 2a484a13e1..83a7eb5224 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 6f5fc26c68..9001b07d8d 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 f7af0f0f5f..a3b356a512 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 49a9a8f6a7..16a3efc1ab 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 1b384789ea..d700382465 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 ecdb4dbeb3..bb993ca43d 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 29dcac32c2..a38984ab77 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 4216ca4070..a58abc5870 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 0f40e4d8a3..287550549c 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 ad07852530..69d3919559 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 1c93f49e18..23fc62deef 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 a9c542a7b4..1b068b9ed2 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 ce63d783bb..e431294905 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 80f2e48dc6..aa26dca75d 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 f3d4b1fb1b..47da30ee20 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 ba50f2a015..ecf0bcc24a 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 0ef7e00e42..680a0fb1a3 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 cd3f224325..1c308f1f55 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 1ab8ed5bae..dfb5186104 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 1aacf8ba6f..1e0fb8af1d 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 73b6c8064d..fd2c66d235 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 520074bb48..a9f9c9d1d8 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 4540cfeca0..9e7c2e5a91 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 754f6c2280..bf8a36ab93 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 61ff58f871..f9e7e7d720 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 61de43fcae..a5abae3fda 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 053a3ba153..48bac48e9a 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 0fa5f00384..2585aee939 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[] =