diff --git a/Makefile.am b/Makefile.am
index 068c15c0db4cb2f68612471ba1cf842098a87a4b..184a9d11dd51248b31f227c355c575f6b935e4f2 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 9ca32f7f689380bf471e3cfc61934378495177e5..8a1924364e1b16570c5b128e793468548840413f 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 b7ccbfc5e79beee8867b2fe23af4db51b9dcf2d2..9bfe93514adcc4b4622ffdbbb806e0b297496a6d 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 09779b7540cc1c68bbe712826c8b7dc90275c1a7..bfb6e3fc709018effc2c160a415c7fcb621b1a40 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 5ec6fb3c2e59a90e4256e8201e5c1f38b721a87b..c1e05f1009d5ac603f80d8a0565604bcfe62baf5 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 bd046cf0962a22efb8d7ed84d3cceb5c52989902..4afed2314d1fa3d7c6097ba01c82ab36f55661f1 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 fd08743c00340500dffbce7d59450226e63a0175..c1366a91a32c69b3b69ef57bdc4e9de5d22fe18b 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 04ca605df0cd8f6f143294e3cf885c9e917effd7..87e100c12196fa2531d5a590b2b4e9732dc4f4e0 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 8b07ac0744925dd1ee95c5556db5e6a7ecd6723c..33df51f5b369294a6609b9b867472f62f056e63c 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 352433272af6902524ada7232019bb50a06683aa..f003c03d5ae74ab526de88085d8348a36a452ae1 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 14ffe3cfa98f004375d30c4bdd83ae55cba911dd..91af2d58d672146a00f246b1162929adfcbff607 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 eb3998505fddf1d407ed9eea9e5f6aa7cbdd245d..9a4fabd1c090985dc97b4a4c218da0f3890375a9 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 cfab09368a614420e0761a2a8fdacf246de49535..863f18b69fac017a9a73aeb6055b028b3a652fc0 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 bed936e09c1e8862e6f80ffa92a03b7733205e6f..aa4d7ca91fd54a3033844f6edbb689bb8e811f9b 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 12731a53bc38e19c4fef76885fc0263c4dad1137..4c51256cc7d32ccfa52facd79e85fcc992cb8805 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 e9281ad5ffb4b08bcf4101ee93c22e14e84a732c..23d5dd5a588b7cb9c71cb5ece518173adfeec3e8 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 d6e070f8ece18051f18066bee9d981d1a54c8ac9..a52cc0fb40a92d4525969fa004a9eff0af874d7b 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 84f6b28dfaed54e7d9aa46468e7f15093d000f5e..96464a29ad295047ee0395f1a161dd4733f2f4a4 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 1caaf10d0320b5f78b6a9cbd2e61203ba19cd637..4eb4488193d362be9fb95e4c0fdb6c6a7fe2c53a 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 8f5fb773c47752702f734da10d22c6351b5e6a09..2d568a980740d51121efdbbedee6cb3c54070113 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 efc25cf5badc294442165cf02abcbb53a1b1b3f6..09409e7016fd7c7c7801864847959900ef212714 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 65c0f105ae7c2ecdc8ef00d109808eabda799754..6f23e219a691c81d78293ef687414e8f0512d79c 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 34ee95d7d00df6a037562e1d7cfee6eccb67ac8b..2a4342e3efeb536b509c86533dfa2cf39da26842 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 b91281f25acbee25048112ae1cb3577fb759821e..9dced9354bfc995904e0ce279a33d211fce6a8e2 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 1f08f197f1771966bf20c3ba3a57c82893214c4b..563e01c190cca02baa90f7ce4e55dc81df5da1b9 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 255b4a306c4d130887272917d4b9aa03aeb667f1..91da4ff266a2c67ae71b08d1a4b98aa1bc15a58c 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 475bb23c944b217fd41651d268541305db9fa5e3..a8caed528c54b2f90a068c6780570c7a0d8e7b5d 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 d452bc57f9ba627d11eae32445455065521b2b0a..d143d850648a3127ce3b571d7f3e54638e0cbb85 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 df70c6a6b48f1894792eaeca1ffd79eda9136cc5..ee51ef8d9c7daddd5cfac6d99ea6f6bab80b286b 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 f381f432e8ef249be734dc01bbcca4899b7d7a72..23293819d38d3147505c38b1c54d6b9b2be20673 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 82c93d09d7b52e2fb083a483c6033964db8c106c..79e8a9dee94f71172a1d91140193fb32b17a78dc 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 71b60804ca04a7fb557c972f241bf647c522978b..b59940734ee21b3f6f478a6ee2d131f8742afc6f 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 5b65835ecc7a76a31040e2739b2d124eb8617768..b6e8ca6c9dd9149222f36c0dd255e9106ba605e7 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 ed6a10cd8ccc7b8b8c2049e34cfa330fdbb3634d..b9a0854ccf2224a37eb445561d7e76db8a00741a 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 6eb1499e09bab8215277970d9fd6f866faea10f2..76cb97c6b299d5cb79a4ce28f65e2eaf26cdda1f 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 3913ef5df7ac40fd85b3944e4c5f03f1194d0d7b..b595668f5334d72eb7f5c32669b0704acde9da11 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 b44c03e6fae1e291eaa3d4505446b69859850f18..df3e83bd51eb47623b63f1237c145c8e0275fafd 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 12d923b9bc08bf5ceee9eb080c5de0dd2dbcf60d..393e5a69e269d01fb69350f30ba07d5e916ec8ef 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 642d6325460c95fbc936d4d026103ec3c7ddf7c6..4d354abbd74658d19f2cd59ed424a69f32d9d3a5 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 63b3ea9c56c4dff1681529a953ad70af4a3c3ba2..3b9dcbb48d2fc31f6a2b9d5294db473ae3377583 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 4b79f17463d9c11110496c77ae1a2a971352cc40..f2523b5a25aa47d778640703cf6c5898e3fc1c2e 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 b874802666bcc05ee2a88cdf6b5ed3c7f2e3b23a..6791bbd3e4572c0c153fb2ae091682c192c791d8 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 302a6f011f60ed2299f87c741e0feb56cd99dc86..90881959fa07f0c4512be1ff5e6e6bb51b8f6f1f 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 d9f637c396587cb304ef0dc544f8ae863337f1ef..ae435a2292331ac63eccc4f89899efb10d018b49 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 bc9861b255032dea64d13585cfd9a7bcd85b4be9..26efd9e62244d8f1f2723587bfa297bf18784e0c 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 b30808a967fedddd0b40f507d27361473b30e1f8..2e7aa5eff3a7a2997b5b8ffb4abff8ec55421661 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 c5b99a8745e2dfa73b8f040f56c7d81a5e0cd8b5..d8dc2873ed30a0c88e028179a90caa1fd527bc07 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 75d91b0384e50a15f05c834b97b0e3b7826626f6..30c6add21111e44b0264be035b3b21f5b423f11c 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 3f743385d1d750d64e4f43ed0fc36035a986c7be..822c56b430fe0bbba26ade8f2d234816936139fd 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 0b446253151d8a2140ecffdd8f7545fe003e8113..26c260c92c06b8a3f5a9d493793a21d7ec5405d0 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 1f4a7a90eb7fb96ec75fbc10a84d4fa663bc0304..1e8dcd6d1825a97924d4ad3817f28a3ae352ba5f 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$ */