update copyright notices.

svn:r3982

51 files changed, 79 insertions, 49 deletions

diff --git a/Makefile.am b/Makefile.am
index 068c15c0db..184a9d11dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,9 @@
+# $Id$
+# Copyright 2002-2004 Roger Dingledine
+# Copyright 2004-2005 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 9ca32f7f68..8a1924364e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,3 +1,7 @@
+dnl $Id$
+dnl Copyright 2001-2004 Roger Dingledine
+dnl Copyright 2004-2005 Roger Dingledine, Nick Mathewson
+dnl See LICENSE for licensing information
 
 AC_INIT
 AM_INIT_AUTOMAKE(tor, 0.1.0.2-rc)
diff --git a/contrib/TorControl.py b/contrib/TorControl.py
index b7ccbfc5e7..9bfe93514a 100755
--- a/contrib/TorControl.py
+++ b/contrib/TorControl.py
@@ -1,4 +1,6 @@
 #!/usr/bin/python
+# TorControl.py -- Python module to interface with Tor Control interface.
+# Copyright 2005 Nick Mathewson -- See LICENSE for licensing information.
 #$Id$
 
 import socket
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index 09779b7540..bfb6e3fc70 100644
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2004 Nick Mathewson.
+# Copyright 2004-2005 Nick Mathewson.
 # See LICENSE in Tor distribution for licensing information.
 
 # This script builds a Macintosh OS X metapackage containing 4 packages:
diff --git a/src/common/aes.c b/src/common/aes.c
index 5ec6fb3c2e..c1e05f1009 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
+ * Copyright 2004-2005 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 bd046cf096..4afed2314d 100644
--- a/src/common/aes.h
+++ b/src/common/aes.h
@@ -1,4 +1,5 @@
-/* Copyright 2003 Roger Dingledine */
+/* Copyright 2003 Roger Dingledine
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/compat.c b/src/common/compat.c
index fd08743c00..c1366a91a3 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 Roger Dingledine; Copyright 2004 Nick Mathewson */
+/* Copyright 2003-2004 Roger Dingledine
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char compat_c_id[] = "$Id$";
diff --git a/src/common/compat.h b/src/common/compat.h
index 04ca605df0..87e100c121 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 Roger Dingledine; Copyright 2004 Nick Mathewson */
+/* Copyright 2003-2004 Roger Dingledinex
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/container.c b/src/common/container.c
index 8b07ac0744..33df51f5b3 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 Roger Dingledine; Copyright 2004 Nick Mathewson */
+/* Copyright 2003-2004 Roger Dingledine
+   Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char container_c_id[] = "$Id$";
diff --git a/src/common/container.h b/src/common/container.h
index 352433272a..f003c03d5a 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 Roger Dingledine; Copyright 2004 Nick Mathewson */
+/* Copyright 2003-2004 Roger Dingledine
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 14ffe3cfa9..91af2d58d6 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char crypto_c_id[] = "$Id$";
diff --git a/src/common/crypto.h b/src/common/crypto.h
index eb3998505f..9a4fabd1c0 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/log.c b/src/common/log.c
index cfab09368a..863f18b69f 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
+ * Copyright 2004-2005 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 bed936e09c..aa4d7ca91f 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/test.h b/src/common/test.h
index 12731a53bc..4c51256cc7 100644
--- a/src/common/test.h
+++ b/src/common/test.h
@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine. */
+/* Copyright 2001,2002,2003 Roger Dingledine.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson *
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index e9281ad5ff..23d5dd5a58 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -1,4 +1,5 @@
 /* Copyright 2004 Roger Dingledine */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char torgzip_c_id[] = "$Id$";
diff --git a/src/common/torgzip.h b/src/common/torgzip.h
index d6e070f8ec..a52cc0fb40 100644
--- a/src/common/torgzip.h
+++ b/src/common/torgzip.h
@@ -1,4 +1,5 @@
-/* Copyright 2003 Roger Dingledine */
+/* Copyright 2003 Roger Dingledine
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/torint.h b/src/common/torint.h
index 84f6b28dfa..96464a29ad 100644
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@ -1,4 +1,5 @@
-/* Copyright 2003 Roger Dingledine */
+/* Copyright 2003 Roger Dingledine
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 1caaf10d03..4eb4488193 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1,4 +1,5 @@
-/* Copyright 2003 Roger Dingledine. */
+/* Copyright 2003 Roger Dingledine.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char tortls_c_id[] = "$Id$";
diff --git a/src/common/tortls.h b/src/common/tortls.h
index 8f5fb773c4..2d568a9807 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -1,4 +1,5 @@
-/* Copyright 2003 Roger Dingledine */
+/* Copyright 2003 Roger Dingledine
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/util.c b/src/common/util.c
index efc25cf5ba..09409e7016 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1,4 +1,5 @@
-/* Copyright 2003 Roger Dingledine */
+/* Copyright 2003 Roger Dingledine
+ * Copyright 2004-2005 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 65c0f105ae..6f23e219a6 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 Roger Dingledine; Copyright 2004 Nick Mathewson */
+/* Copyright 2003-2004 Roger Dingledine
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 34ee95d7d0..2a4342e3ef 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char buffers_c_id[] = "$Id$";
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index b91281f25a..9dced9354b 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuitbuild_c_id[] = "$Id$";
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 1f08f197f1..563e01c190 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuitlist_c_id[] = "$Id$";
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 255b4a306c..91da4ff266 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuituse_c_id[] = "$Id$";
diff --git a/src/or/command.c b/src/or/command.c
index 475bb23c94..a8caed528c 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char command_c_id[] = "$Id$";
diff --git a/src/or/config.c b/src/or/config.c
index d452bc57f9..d143d85064 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char config_c_id[] = "$Id$";
diff --git a/src/or/connection.c b/src/or/connection.c
index df70c6a6b4..ee51ef8d9c 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_c_id[] = "$Id$";
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f381f432e8..23293819d3 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_edge_c_id[] = "$Id$";
@@ -38,7 +38,7 @@ connection_close_unattached_ap(connection_t *conn, int endreason) {
 // be defined yet. -RD
     if (endreason == END_STREAM_REASON_ALREADY_SOCKS_REPLIED)
       log_fn(LOG_WARN,"Bug: stream (marked at %s:%d) sending two socks replies?",
-             conn->marked_for_close_file?conn->marked_for_close_file:"", 
+             conn->marked_for_close_file?conn->marked_for_close_file:"",
              conn->marked_for_close);
 
     if (conn->socks_request->command == SOCKS_COMMAND_CONNECT)
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 82c93d09d7..79e8a9dee9 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_or_c_id[] = "$Id$";
diff --git a/src/or/control.c b/src/or/control.c
index 71b60804ca..b59940734e 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char control_c_id[] = "$Id$";
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index 5b65835ecc..b6e8ca6c9d 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -1,5 +1,5 @@
 /* Copyright 2003-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char cpuworker_c_id[] = "$Id$";
diff --git a/src/or/directory.c b/src/or/directory.c
index ed6a10cd8c..b9a0854ccf 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1,5 +1,5 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char directory_c_id[] = "$Id$";
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 6eb1499e09..76cb97c6b2 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1,5 +1,5 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dirserv_c_id[] = "$Id$";
diff --git a/src/or/dns.c b/src/or/dns.c
index 3913ef5df7..b595668f53 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1,5 +1,5 @@
 /* Copyright 2003-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dns_c_id[] = "$Id$";
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index b44c03e6fa..df3e83bd51 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char hibernate_c_id[] = "$Id$";
diff --git a/src/or/main.c b/src/or/main.c
index 12d923b9bc..393e5a69e2 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char main_c_id[] = "$Id$";
diff --git a/src/or/onion.c b/src/or/onion.c
index 642d632546..4d354abbd7 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char onion_c_id[] = "$Id$";
diff --git a/src/or/or.h b/src/or/or.h
index 63b3ea9c56..3b9dcbb48d 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/relay.c b/src/or/relay.c
index 4b79f17463..f2523b5a25 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char relay_c_id[] = "$Id$";
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index b874802666..6791bbd3e4 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendclient_c_id[] = "$Id$";
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 302a6f011f..90881959fa 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendmid_c_id[] = "$Id$";
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index d9f637c396..ae435a2292 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendservice_c_id[] = "$Id$";
diff --git a/src/or/rephist.c b/src/or/rephist.c
index bc9861b255..26efd9e622 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rephist_c_id[] = "$Id$";
diff --git a/src/or/router.c b/src/or/router.c
index b30808a967..2e7aa5eff3 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char router_c_id[] = "$Id$";
@@ -614,7 +614,6 @@ int router_compare_to_my_exit_policy(connection_t *conn)
 
 }
 
-
 /** Return true iff <b>router</b> has the same nickname as this OR.  (For an
  * OP, always returns false.)
  */
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index c5b99a8745..d8dc2873ed 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char routerlist_c_id[] = "$Id$";
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 75d91b0384..30c6add211 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 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char routerparse_c_id[] = "$Id$";
diff --git a/src/or/test.c b/src/or/test.c
index 3f743385d1..822c56b430 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1,5 +1,5 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char test_c_id[] = "$Id$";
diff --git a/src/or/tor_main.c b/src/or/tor_main.c
index 0b44625315..26c260c92c 100644
--- a/src/or/tor_main.c
+++ b/src/or/tor_main.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 Roger Dingledine. */
+/* Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char tor_main_c_id[] = "$Id$";
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 1f4a7a90eb..1e8dcd6d18 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Nick Mathewson */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */