clean up copyrights, and assign 2007 copyrights to The Tor Project, Inc

svn:r12786

LICENSE

@@ -13,7 +13,8 @@
 Tor is distributed under this license:
 
 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, The Tor Project, Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are

src/common/aes.c

@@ -1,6 +1,7 @@
-/* Copyright (c) 2001 Matej Pfajfar.
+/* Copyright (c) 2001, Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char aes_c_id[] = "$Id$";

src/common/aes.h

@@ -1,5 +1,6 @@
-/* Copyright 2003 Roger Dingledine
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2003, Roger Dingledine
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/compat.c

@@ -1,5 +1,6 @@
-/* Copyright 2003-2004 Roger Dingledine
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2003-2004, Roger Dingledine
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char compat_c_id[] =

src/common/compat.h

@@ -1,5 +1,6 @@
-/* Copyright 2003-2004 Roger Dingledinex
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2003-2004, Roger Dingledinex
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/container.c

@@ -1,5 +1,6 @@
-/* Copyright 2003-2004 Roger Dingledine
-   Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2003-2004, Roger Dingledine
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char container_c_id[] =

src/common/container.h

@@ -1,5 +1,6 @@
-/* Copyright 2003-2004 Roger Dingledine
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2003-2004, Roger Dingledine
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/crypto.c

@@ -1,6 +1,7 @@
-/* Copyright (c) 2001 Matej Pfajfar.
+/* Copyright (c) 2001, Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char crypto_c_id[] =

src/common/crypto.h

@@ -1,6 +1,7 @@
-/* Copyright (c) 2001 Matej Pfajfar.
+/* Copyright (c) 2001, Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/log.c

@@ -1,6 +1,7 @@
-/* Copyright (c) 2001 Matej Pfajfar.
+/* Copyright (c) 2001, Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char log_c_id[] = "$Id$";

src/common/log.h

@@ -1,6 +1,7 @@
-/* Copyright (c) 2001 Matej Pfajfar.
+/* Copyright (c) 2001, Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/mempool.c

@@ -1,4 +1,4 @@
-/* Copyright 2007 Nick Mathewson */
+/* Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 #if 1

src/common/mempool.h

@@ -1,4 +1,4 @@
-/* Copyright 2007 Nick Mathewson */
+/* Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/test.h

@@ -1,5 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine.
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2001-2003, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/torgzip.c

@@ -1,5 +1,6 @@
-/* Copyright 2004 Roger Dingledine */
-/* Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char torgzip_c_id[] =

src/common/torgzip.h

@@ -1,5 +1,6 @@
-/* Copyright 2003 Roger Dingledine
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2003, Roger Dingledine
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/torint.h

@@ -1,5 +1,6 @@
-/* Copyright 2003 Roger Dingledine
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2003, Roger Dingledine
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/tortls.c

@@ -1,5 +1,6 @@
-/* Copyright 2003 Roger Dingledine.
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2003, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char tortls_c_id[] =

src/common/tortls.h

@@ -1,5 +1,6 @@
-/* Copyright 2003 Roger Dingledine
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2003, Roger Dingledine
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/util.c

@@ -1,5 +1,6 @@
-/* Copyright 2003 Roger Dingledine
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2003, Roger Dingledine
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char util_c_id[] = "$Id$";

src/common/util.h

@@ -1,5 +1,6 @@
-/* Copyright 2003-2004 Roger Dingledine
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2003-2004, Roger Dingledine
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/or/buffers.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char buffers_c_id[] =

src/or/circuitbuild.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuitbuild_c_id[] =

src/or/circuitlist.c

@@ -1,6 +1,7 @@
 /* Copyright 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuitlist_c_id[] =

src/or/circuituse.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuituse_c_id[] =

src/or/command.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char command_c_id[] =

src/or/config.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char config_c_id[] = \

src/or/connection.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_c_id[] =

src/or/connection_edge.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_edge_c_id[] =

src/or/connection_or.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_or_c_id[] =

src/or/control.c

@@ -1,4 +1,5 @@
-/* Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char control_c_id[] =

src/or/cpuworker.c

@@ -1,5 +1,6 @@
-/* Copyright 2003-2004 Roger Dingledine.
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2003-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char cpuworker_c_id[] =

src/or/directory.c

@@ -1,5 +1,6 @@
-/* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char directory_c_id[] =

src/or/dirserv.c

@@ -1,5 +1,6 @@
-/* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dirserv_c_id[] =

src/or/dirvote.c

@@ -1,5 +1,6 @@
-/* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dirvote_c_id[] =

src/or/dns.c

@@ -1,5 +1,6 @@
-/* Copyright 2003-2004 Roger Dingledine.
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2003-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dns_c_id[] =

src/or/dnsserv.c

@@ -1,4 +1,4 @@
-/* Copyright 2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dnsserv_c_id[] =

src/or/eventdns_tor.h

@@ -1,3 +1,5 @@
+/* Copyright (c) 2007, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
 
 #include "orconfig.h"
 #define DNS_USE_OPENSSL_FOR_ID

src/or/hibernate.c

@@ -1,4 +1,5 @@
-/* Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char hibernate_c_id[] =

src/or/main.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char main_c_id[] =

src/or/networkstatus.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char networkstatus_c_id[] =
@@ -819,7 +820,7 @@ router_get_consensus_status_by_id(const char *digest)
  * nickname, but the Named flag isn't set for that router. */
 routerstatus_t *
 router_get_consensus_status_by_nickname(const char *nickname,
-                                       int warn_if_unnamed)
+                                        int warn_if_unnamed)
 {
   char digest[DIGEST_LEN];
   routerstatus_t *best=NULL;

src/or/ntmain.c

@@ -1,6 +1,6 @@
-/* Copyright (c) 2001 Matej Pfajfar.
- * copyright (c) 2001-2004, Roger Dingledine.
- * Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/or/onion.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char onion_c_id[] =

src/or/or.h

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/or/policies.c

@@ -1,5 +1,6 @@
 /* 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char policies_c_id[] = \

src/or/relay.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char relay_c_id[] =

src/or/rendclient.c

@@ -1,4 +1,5 @@
-/* Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendclient_c_id[] =

src/or/rendcommon.c

@@ -1,4 +1,5 @@
-/* Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendcommon_c_id[] =

src/or/rendmid.c

@@ -1,4 +1,5 @@
-/* Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendmid_c_id[] =

src/or/rendservice.c

@@ -1,4 +1,5 @@
-/* Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendservice_c_id[] =

src/or/rephist.c

@@ -1,4 +1,5 @@
-/* Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rephist_c_id[] =

src/or/router.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char router_c_id[] =

src/or/routerlist.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char routerlist_c_id[] =

src/or/routerparse.c

@@ -1,6 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * 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, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char routerparse_c_id[] =

src/or/test.c

@@ -1,5 +1,6 @@
-/* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+/* Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char test_c_id[] =

src/or/test_data.c

@@ -1,5 +1,6 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, 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[] =

src/or/tor_main.c

@@ -1,5 +1,6 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004-2007 Roger Dingledine, Nick Mathewson. */
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char tor_main_c_id[] =

src/tools/tor-gencert.c

@@ -1,4 +1,4 @@
-/* Copyright 2007 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2007 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  $ */
 

src/tools/tor-resolve.c

@@ -1,4 +1,4 @@
-/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
+/* Copyright (c) 2004-2005, Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */