diff --git a/Makefile.am b/Makefile.am
index 8efeb45d7b..5e324a4c09 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 5c3472c6e6..9ae9f6dceb 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 8e675a6d3f..6abd6b6bbc 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 c234118fa0..6dc4896988 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 541ebe0027..b4b90187cf 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 10605dbe68..a2a87f02e7 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 b8d859a17a..919f542768 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 e8df24d5d8..5ac16bdb1b 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 e4364109de..6a795d996c 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 a13fc92ba2..73367d691c 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 9b414612fd..45debcb40c 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 178c10a082..54256bdbc6 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 6c86dd3788..25499e4922 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 e33edd1eed..5ec4eaea1c 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 546d963635..577f5cc653 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 9fed569e45..17ee166bd8 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 09e22bd2d4..1ce77cb61d 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 e73572e42b..057f9708d3 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 b7a50a599b..2d9c3b031f 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 2699842325..78c8bcaa27 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 163b0402c4..f18f7137d5 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 2169fbbb6c..ef138b6573 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 686350cae0..1ca6dd9b61 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 2a89505b92..a1a6baab4e 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 512b5d59dd..6ba91fa398 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 002a7df231..67770ffd5a 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 fb752e0d2e..dc5db40adf 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 5765431d77..14dd4994d1 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 2a268f5e25..bb42ecf936 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 8b5c7d608a..c3bb69ec12 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 3f547a8fc1..396e3914be 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 4a44f0c071..220673fe7d 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 ff07f21b9f..210dc86ff0 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 7b4a934459..31e4d67d6c 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 b36bfa067b..877ee3099b 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 1a8ea052ed..e2ff5723ac 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 e1a56e4c1f..78faaf70de 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 d2b5bacc79..ca0c0ce3ab 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 e0e0f9b16a..f4361209d5 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 eecb5ea4ef..5ad4df1f08 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 3c865134aa..aaf35b639f 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 c2ecab64b9..293f07c418 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 864258583c..729e79f599 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 e786e5bdd5..97c9a4299b 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 c91b7d556b..281d011b9d 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 16a5bceda0..7d1904b992 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 75b07aa623..882540edca 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 e45376539a..31f264b637 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 c8f6f43f04..4efb3a021c 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 0c83769ca1..d5ed2f888d 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 5506547f95..aa97453a1e 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 a1e0ce7950..9a18ee7258 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 0e451a1523..b3fb2adcb8 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 f4a1a9fb8b..e9e78d9e0a 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 91936f9e48..9d38d0127a 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 c4ebe857ff..d4ce7bf7f9 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 e21cd37a5b..1dc487b9f4 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 46a6af085a..e51a67b3bb 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 17ef79aa2e..c9c58213c6 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 ca820a3290..fe7315ac7d 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 0269de88fd..4dee5e85ae 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$ */