diff --git a/Makefile.am b/Makefile.am
index 8efeb45d7ba15b75b4f8449a77143be7fdffe427..5e324a4c093f7a166c4cb20560e84122dd396380 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 # $Id$
 # Copyright (c) 2001-2004, Roger Dingledine
-# Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
+# Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+# Copyright (c) 2007-2008, The Tor Project, Inc.
 # See LICENSE for licensing information
 
 AUTOMAKE_OPTIONS = foreign
diff --git a/acinclude.m4 b/acinclude.m4
index 5c3472c6e6ea017a5a75e3813fa8c20ce5826a4d..9ae9f6dcebdf8942821a159ed3aae3bd77ddaf75 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,7 +1,8 @@
 dnl $Id$
 dnl Helper macros for Tor configure.in
 dnl Copyright (c) 2001-2004, Roger Dingledine
-dnl Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
+dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+dnl Copyright (c) 2007-2008, Roger Dingledine, Nick Mathewson
 dnl See LICENSE for licensing information
 
 AC_DEFUN([TOR_EXTEND_CODEPATH],
@@ -206,4 +207,4 @@ if test x$tor_cv_$1_declared != xno ; then
   AC_DEFINE($2, 1,
        [Defined if the prototype for $1 seems to be present.])
 fi
-])
\ No newline at end of file
+])
diff --git a/configure.in b/configure.in
index 8e675a6d3ffef4aebce422d764937e3818ba0dec..6abd6b6bbcc9166c054418c5e5cf54439060cc54 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
 dnl $Id$
 dnl Copyright (c) 2001-2004, Roger Dingledine
-dnl Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
+dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+dnl Copyright (c) 2007-2008, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_INIT
diff --git a/src/common/aes.c b/src/common/aes.c
index c234118fa02ac5a419a5f1d7d0ecc90a30080ab7..6dc4896988f9f5d09e71063de50cf9322734ab6e 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* 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 541ebe00279b644387f7014c0bd8307325c7fb12..b4b90187cfdd8cce383b04cb3262ef492b321ecc 100644
--- a/src/common/aes.h
+++ b/src/common/aes.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/compat.c b/src/common/compat.c
index 10605dbe68cbcbe823fedf50c3446466bfed63f8..a2a87f02e7f35b2c0b6a787dddc56c58ab47cfe2 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char compat_c_id[] =
diff --git a/src/common/compat.h b/src/common/compat.h
index b8d859a17a83d74da53f9e6b75854e3aaec51660..919f542768d3918ab79a73dfc40f29cbf29b8844 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledinex
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/container.c b/src/common/container.c
index e8df24d5d8417db07d5dcd7104d69bad30f17412..5ac16bdb1b56871eadbfdaa5f4d97a3bbd0424d6 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char container_c_id[] =
diff --git a/src/common/container.h b/src/common/container.h
index e4364109debc55f9700f3f4d5223b987663b6d42..6a795d996cdfd455b1413980c0d3ffefef20fcd3 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/crypto.c b/src/common/crypto.c
index a13fc92ba2516a9e3133b62c9f9c9543ee2384dc..73367d691c112e677c66821bc6bf5530a00883ff 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char crypto_c_id[] =
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 9b414612fd3632a1b8829c28a4a9c5c5b90eadb1..45debcb40c41f8efe56841532766425633a120ae 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/log.c b/src/common/log.c
index 178c10a0823445cea2b981a5a90676d41dcf5c2c..54256bdbc6aee35789044af9441710b74cb69c8a 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* 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 6c86dd3788f45cd4a822da4e528e2fcc5d2a1e77..25499e49220e28a1c03063be45314b1efbae159d 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/mempool.c b/src/common/mempool.c
index e33edd1eed3718aa9b7bfccf42a760b817259ec7..5ec4eaea1c84e794a468c2556fd92f19ac098c14 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, The Tor Project, Inc. */
+/* Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 #if 1
diff --git a/src/common/mempool.h b/src/common/mempool.h
index 546d963635e9f6d8ad702b31571ae39aa5e418f4..577f5cc653963b22f4b52215a8c317d9c6038032 100644
--- a/src/common/mempool.h
+++ b/src/common/mempool.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, The Tor Project, Inc. */
+/* Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/test.h b/src/common/test.h
index 9fed569e45ab5120303b1e41d673cb3a3fe2c628..17ee166bd8b140fe42d835992543f3fa8ae7d46b 100644
--- a/src/common/test.h
+++ b/src/common/test.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2003, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index 09e22bd2d42abe74a2d5b8a965dc72612af59433..1ce77cb61dfd0d47b04e506e9e4235a6eb17ab98 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char torgzip_c_id[] =
diff --git a/src/common/torgzip.h b/src/common/torgzip.h
index e73572e42b0ca5d6518756c7cf398a2b1f1b3277..057f9708d350750eef8df612d41ec4d2bfbf6965 100644
--- a/src/common/torgzip.h
+++ b/src/common/torgzip.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/torint.h b/src/common/torint.h
index b7a50a599b02717a3d7e291eabc94840f9d77130..2d9c3b031f6e99b9900bd9e60d27ef1e4ed0d36e 100644
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 2699842325494e00191c9b41653e38ec650f3f82..78c8bcaa27e703f15729e9d101b0b7276a3261cb 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char tortls_c_id[] =
diff --git a/src/common/tortls.h b/src/common/tortls.h
index 163b0402c4d1aabbee911a1193ea9d82134aaa02..f18f7137d5e75e95fb76341791fb9709ca9de7b6 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/common/util.c b/src/common/util.c
index 2169fbbb6c298243265d09c918b41b109573cc16..ef138b6573bd1b39050486a240bf9487f75a668a 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* 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 686350cae0a7f43ce1a767c59650e9d2a7b36120..1ca6dd9b61734bd7349ff1ea226ddc26e79e290d 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 2a89505b92bab395ad5f5992f4c1b3dc6aa75375..a1a6baab4eddccb3fd43009b5ef974c56675ebed 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char buffers_c_id[] =
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 512b5d59dd06cbcfe08c429b38b223d85914e6be..6ba91fa3987e982cfe53c6423bf0c8ccd80bcc7a 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuitbuild_c_id[] =
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 002a7df231ce59ca23f07885289fdf272294a98a..67770ffd5a1c74e3edf86ae9a9847185603e9df8 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1,7 +1,7 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuitlist_c_id[] =
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index fb752e0d2e42afff0abc858fd6ef2a8eaa6ae1b9..dc5db40adfff493de995878cdf227e2343fde09c 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuituse_c_id[] =
diff --git a/src/or/command.c b/src/or/command.c
index 5765431d77a1c78a8e82788ac6c41fcee697e233..14dd4994d1e0cf530a9824bc119c1e313298412d 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char command_c_id[] =
diff --git a/src/or/connection.c b/src/or/connection.c
index 2a268f5e252a5305636cf3f3b62fc88cef5f0c84..bb42ecf936e68b7c411ff9e9f9bb5252bab6f6dc 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* 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 8b5c7d608ab4539f50e44a0c86ba7778c0782b5d..c3bb69ec12650721fbe4502aad1a7990dc40b440 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* 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 3f547a8fc108855ae04b901b72456b82e58b95ad..396e3914be6cfbd8308f57c17adcf4bf5217ac4c 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* 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 4a44f0c071c51f134ec51aa5ad19e987bf7f1f84..220673fe7da0d7f15a59cdc13a1194b011558111 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char control_c_id[] =
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index ff07f21b9f2352c0536fe3e19218fb9ba7ab0058..210dc86ff0aad145e41298c82eb00f5b2064dab6 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char cpuworker_c_id[] =
diff --git a/src/or/directory.c b/src/or/directory.c
index 7b4a9344591e58ef4349a5f0fd70afaedc9b0549..31e4d67d6c75c80ee20654abaabdcaa6744bc3fb 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char directory_c_id[] =
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index b36bfa067b6ff9a9dd2671cca86413da5c9b3a69..877ee3099bc2e59d64adb458207c89110af4d910 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dirserv_c_id[] =
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 1a8ea052edd014de6cf3ede9aa9968da4f5e14e2..e2ff5723acf4c35f4d50185f50fb81147437016e 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dirvote_c_id[] =
diff --git a/src/or/dns.c b/src/or/dns.c
index e1a56e4c1f2f6199157669dcc4c3a019f1fba97e..78faaf70de571bb375ec89e0264b91ad7d9f20f0 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dns_c_id[] =
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index d2b5bacc7948e11b968952c4b54f0f910dfca373..ca0c0ce3ab86af2a89b43d549fe6e1a2adb6267e 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, The Tor Project, Inc. */
+/* Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dnsserv_c_id[] =
diff --git a/src/or/eventdns_tor.h b/src/or/eventdns_tor.h
index e0e0f9b16aefd47bb7ca29ccf2217ebaaff9e43d..f4361209d5b16a88b47f092d51f3e1e8a5656aec 100644
--- a/src/or/eventdns_tor.h
+++ b/src/or/eventdns_tor.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, The Tor Project, Inc. */
+/* Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/or/geoip.c b/src/or/geoip.c
index eecb5ea4ef429e2c7fe01fc57593d7bc3ed2a75c..5ad4df1f083f30c5f045c34360bb8054c1674dd9 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, The Tor Project, Inc. */
+/* Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id: /tor/trunk/src/or/networkstatus.c 15493 2007-12-16T18:33:25.055570Z nickm  $ */
 const char geoip_c_id[] =
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 3c865134aafca69d3c5b635171555bc04528f108..aaf35b639ffbbe10dfb3b31613463428f39dd00f 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char hibernate_c_id[] =
diff --git a/src/or/main.c b/src/or/main.c
index c2ecab64b98c26f5cda96b44d48c31345a7b6242..293f07c4186fc56b45389f4e7e529c4e2b82daeb 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char main_c_id[] =
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 864258583c2063060042baa09f2d7bb8a4142ab6..729e79f5998bd7772ecc6a620450e16f0faa362c 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char networkstatus_c_id[] =
diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index e786e5bdd533fdaea3fb98a86987befb63206e7a..97c9a4299bec88ec0fe80c6926d42a3c7972651d 100644
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/onion.c b/src/or/onion.c
index c91b7d556b91d6caedb091c099437ac47e927ef8..281d011b9d5973e89c431b567c058a16cf395ad0 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char onion_c_id[] =
diff --git a/src/or/or.h b/src/or/or.h
index 16a5bceda0848e1a574f002b52e9bb7e84462a85..7d1904b9929f1f7ec3a35161e8442fc9937fd641 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/policies.c b/src/or/policies.c
index 75b07aa623bf23294da4a022e9d111694bf7f8dd..882540edca13e70cb95cbba54afb031e9c9f163b 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char policies_c_id[] = \
diff --git a/src/or/relay.c b/src/or/relay.c
index e45376539a0612c44e47c25e52d3cb58ec96520c..31f264b63774ade3aef561ae5bf414431c7df574 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char relay_c_id[] =
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index c8f6f43f04b38d0bc99cf3218a6d9018af2f340e..4efb3a021c2aab7d53186ba0e69551707466be0d 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendclient_c_id[] =
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 0c83769ca155f928dd10fabf1b133710e2453abc..d5ed2f888d05004f8ab60bf0d2c0295aec3d2577 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendcommon_c_id[] =
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 5506547f95dc43a8ada1bebe4c840c08d9e5101b..aa97453a1e289f571b822b368317b3ebb18a1cc4 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendmid_c_id[] =
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index a1e0ce7950de29dc963195260fc49c8f6120a2ef..9a18ee7258e85fc47659a199f054c43edbbb2464 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendservice_c_id[] =
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 0e451a1523378ec7c1a834a16afd276c1b212359..b3fb2adcb8714346b3a110f57cd70addebbefca4 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rephist_c_id[] =
diff --git a/src/or/router.c b/src/or/router.c
index f4a1a9fb8b7958089282b2fc51b89fa0adcc7d19..e9e78d9e0a565883889dd8e48c6620ed5b9ef979 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char router_c_id[] =
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 91936f9e48c8d72de78d74b2a2a5399b6cba79f0..9d38d0127a4ce609c201ad3235ffdf0781427e8f 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char routerlist_c_id[] =
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index c4ebe857ff170d6f6454d5243ca3bee7fa4be32e..d4ce7bf7f927ea96a8b93139865e4813af58637a 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char routerparse_c_id[] =
diff --git a/src/or/test.c b/src/or/test.c
index e21cd37a5b84d62954920fee2917e146240250dd..1dc487b9f4dba74488595cd06b7cfb38fbde29a9 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char test_c_id[] =
diff --git a/src/or/test_data.c b/src/or/test_data.c
index 46a6af085af55307c4d42598d0e2773f604d8504..e51a67b3bb1ee7e9fb3079b74c323e55eafdb2d6 100644
--- a/src/or/test_data.c
+++ b/src/or/test_data.c
@@ -1,6 +1,6 @@
 /* Copyright 2001-2004 Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id: /tor/trunk/src/or/test.c 13338 2007-06-10T19:13:32.101740Z nickm  $ */
 const char test_data_c_id[] =
diff --git a/src/or/tor_main.c b/src/or/tor_main.c
index 17ef79aa2e7b41580c3daead3b96145039435105..c9c58213c6da57eec3fba3588e3fdf560ba27fe9 100644
--- a/src/or/tor_main.c
+++ b/src/or/tor_main.c
@@ -1,6 +1,6 @@
 /* Copyright 2001-2004 Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007, The Tor Project, Inc. */
+ * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char tor_main_c_id[] =
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index ca820a32907d6abbfd4f8d4bba44f687ce5414e2..fe7315ac7d00bc9024a8d87789bf9fa9549ddbd5 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 The Tor Project, Inc. */
+/* Copyright (c) 2007-2008 The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id: /tor/trunk/src/tools/tor-resolve.c 12481 2007-04-21T17:27:19.371353Z nickm  $ */
 
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 0269de88fd31053d6c69578c4a84f4ff21768918..4dee5e85ae4bf10ea0d260f6c86834a442c2fea9 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -1,4 +1,6 @@
-/* Copyright (c) 2004-2005, Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+ * Copyright (c) 2007-2008, The Tor Project, Inc.
+ */
 /* See LICENSE for licensing information */
 /* $Id$ */