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

svn:r12786

diff --git a/LICENSE b/LICENSE
index 6c50b10a0c738e1bcc7d5ab6a020f8409def7935..0057f7b661a9b1cb151cbbfef6abb7d34cac7c82 100644 (file)
--- a/LICENSE
+++ b/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

diff --git a/src/common/aes.c b/src/common/aes.c
index 0a6644ed99ff34e8e3caba00719dac3d812968ec..c234118fa02ac5a419a5f1d7d0ecc90a30080ab7 100644 (file)
--- a/src/common/aes.c
+++ b/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$";

diff --git a/src/common/aes.h b/src/common/aes.h
index 264cf8c1b49d89b6d68b4a853f32ce52137163f2..3f4d492b3cf57f738f48dbf1533cb535e35173f7 100644 (file)
--- a/src/common/aes.h
+++ b/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$ */
 

diff --git a/src/common/compat.c b/src/common/compat.c
index d02049836ad718f67a9310bd34f202426db5be39..b343c4a3b79c5e0924bb96b2f4a844a293c2d5e2 100644 (file)
--- a/src/common/compat.c
+++ b/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[] =

diff --git a/src/common/compat.h b/src/common/compat.h
index 68c65569e4f9e44cd89be85d7a64a88b6b259e28..d92b06ac343255910323bf2ba8142b307fcc1888 100644 (file)
--- a/src/common/compat.h
+++ b/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$ */
 

diff --git a/src/common/container.c b/src/common/container.c
index 77d747caad11a698bb39b3d1f844554a27f89d59..eeebc15bf96d4e2b65d5c9e688dccd0051413b8d 100644 (file)
--- a/src/common/container.c
+++ b/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[] =

diff --git a/src/common/container.h b/src/common/container.h
index 6e1e1801c4562eb25730060315d70db6605275e2..ce1f3d416162523adca552334f6aa7cddf9cac4d 100644 (file)
--- a/src/common/container.h
+++ b/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$ */
 

diff --git a/src/common/crypto.c b/src/common/crypto.c
index ad9e11a2616d178d536799e22c19f992a1325b31..cb9a364646403a57f9b2654993a4de690f7cbc39 100644 (file)
--- a/src/common/crypto.c
+++ b/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[] =

diff --git a/src/common/crypto.h b/src/common/crypto.h
index 3f85295145557f92bab09dc1f887c2260c5eb78c..9b414612fd3632a1b8829c28a4a9c5c5b90eadb1 100644 (file)
--- a/src/common/crypto.h
+++ b/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$ */
 

diff --git a/src/common/log.c b/src/common/log.c
index d471e9f1ef43fca8cce30f72679195ea7f511b6a..147c2d18eeba4ce14a53934046821fbd083c6e9c 100644 (file)
--- a/src/common/log.c
+++ b/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$";

diff --git a/src/common/log.h b/src/common/log.h
index 4a29375fa49b262454aac61b0ab5ff2901ed4d27..d2693744bd726b5f742f2df40aabe0bea730b634 100644 (file)
--- a/src/common/log.h
+++ b/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$ */
 

diff --git a/src/common/mempool.c b/src/common/mempool.c
index cfa2b45e501a3eb8c8bec94e6c7ec68551253066..142ba0b9ae18fa92ca33045f16499a4bcd67b68b 100644 (file)
--- a/src/common/mempool.c
+++ b/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

diff --git a/src/common/mempool.h b/src/common/mempool.h
index 4b6f480d5bbef61d55fa28dfc5e98dcbb080124d..546d963635e9f6d8ad702b31571ae39aa5e418f4 100644 (file)
--- a/src/common/mempool.h
+++ b/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$ */
 

diff --git a/src/common/test.h b/src/common/test.h
index b6b10d4c228e9765cff13dca160804691501fa57..9fed569e45ab5120303b1e41d673cb3a3fe2c628 100644 (file)
--- a/src/common/test.h
+++ b/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$ */
 

diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index f1771c183c28438506e9486cf32ecc695f222c26..1fc301260cf19653d31b0724ad665fec89ef8046 100644 (file)
--- a/src/common/torgzip.c
+++ b/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[] =

diff --git a/src/common/torgzip.h b/src/common/torgzip.h
index 7f53fe86c14f7cd301f4573cf28f26ed4c07f74c..e73572e42b0ca5d6518756c7cf398a2b1f1b3277 100644 (file)
--- a/src/common/torgzip.h
+++ b/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$ */
 

diff --git a/src/common/torint.h b/src/common/torint.h
index 1d0a40560bb10deaf728580b6b9a15ff6e89cd81..b7a50a599b02717a3d7e291eabc94840f9d77130 100644 (file)
--- a/src/common/torint.h
+++ b/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$ */
 

diff --git a/src/common/tortls.c b/src/common/tortls.c
index b2dbc1d1cad7835c51e2cf98ad1f4ba59b9d66d7..94abe24d9c1c8dfc4e636e06e986ab2d853bb4d8 100644 (file)
--- a/src/common/tortls.c
+++ b/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[] =

diff --git a/src/common/tortls.h b/src/common/tortls.h
index fe18f3787dcb64d84b004abd904fdb78fb042019..b802285bde79be2a84ee440012fd0574e70f8eb4 100644 (file)
--- a/src/common/tortls.h
+++ b/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$ */
 

diff --git a/src/common/util.c b/src/common/util.c
index 40aafb8c2f3c9a4798a50909267a0382d863925c..91f588ba472bdd5b699e680194f6f2b500ed9f13 100644 (file)
--- a/src/common/util.c
+++ b/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$";

diff --git a/src/common/util.h b/src/common/util.h
index 43587af72a672b2158cc8cce48327a4c849abe77..c0343cf2fd3ea747b6bb5a946732da1eb9d09536 100644 (file)
--- a/src/common/util.h
+++ b/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$ */
 

diff --git a/src/or/buffers.c b/src/or/buffers.c
index cc4b3930703c65b7642ccb56a468c587298381b3..e22cf11fe92431dec1f37c5258067ce47397244c 100644 (file)
--- a/src/or/buffers.c
+++ b/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[] =

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 22d9c912dc7971f8fde2253e0fa6fdd7a946538d..aff1de1675f06b5a2e4fd196362f4fc2a083ec03 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/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[] =

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 0051d46dffc0e7051201e46ee1742919ffd0d391..375156b4e33f3c8253e5eef9a376481c762f9124 100644 (file)
--- a/src/or/circuitlist.c
+++ b/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[] =

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 4289e0f62a539e98aa754da17457c7b8d4127dec..5bad9e65feea5cb91d77e5273e05d183ebe5016d 100644 (file)
--- a/src/or/circuituse.c
+++ b/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[] =

diff --git a/src/or/command.c b/src/or/command.c
index fe1a3594d618abe3af50939538b57374376fe083..b39080429e617dcf0c9a7cdcdd588aeca800d416 100644 (file)
--- a/src/or/command.c
+++ b/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[] =

diff --git a/src/or/config.c b/src/or/config.c
index f4d245117fa63f3af302cf43af9396784eb437b1..12be45826c2358371be9bf2cfbefed6cc607b57f 100644 (file)
--- a/src/or/config.c
+++ b/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[] = \

diff --git a/src/or/connection.c b/src/or/connection.c
index a39d5d7108530927f40c171cc7c4f2afe24c4dda..ba0bd63e7ab68f06b37644977bb9321b1be8249f 100644 (file)
--- a/src/or/connection.c
+++ b/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[] =

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f62984259ea49e4830808e6bb8352ffbb622efdc..54c6f87d71ab145094742b4e0963ff78581e9bc2 100644 (file)
--- a/src/or/connection_edge.c
+++ b/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[] =

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 2540df2ff7a3782e84f7dc649cb85ab4f8d93a7d..c4f61577d5e6a80fb5edb651cb95089a3066bdb2 100644 (file)
--- a/src/or/connection_or.c
+++ b/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[] =

diff --git a/src/or/control.c b/src/or/control.c
index 468b622b51879c8b96e79a626251b91de89e22ac..680973b9998538a0b404d0e989ac6c6a1ffb0592 100644 (file)
--- a/src/or/control.c
+++ b/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[] =

diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index 2fb0e7d2a0e3c12ed466ed6e33fc835d5596be1e..b1f56d3dbbf781a0ae56519194eacc1a201ac47e 100644 (file)
--- a/src/or/cpuworker.c
+++ b/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[] =

diff --git a/src/or/directory.c b/src/or/directory.c
index 628c94e249d97c71e7d612b3e2d1fadc5c4e2c2b..ba3f675f9e01b34b74d13e9c0a07a1a6d7cbccaf 100644 (file)
--- a/src/or/directory.c
+++ b/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[] =

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 83cbbf630701d3893e9f5c7b06b1a5cb7e4efffe..c8d7b513b8559e89cb16cbd335966aab34885f9a 100644 (file)
--- a/src/or/dirserv.c
+++ b/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[] =

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 49c3f7454fbda20f65a0d52538e7763d2eb6329d..364dc49a443496835539415c74f3a93ab69d03fd 100644 (file)
--- a/src/or/dirvote.c
+++ b/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[] =

diff --git a/src/or/dns.c b/src/or/dns.c
index 1e0dcb253d5362b3dc73757a1dc910fab05be26e..b4b86502fb1a936ee0cca99e834cf8699092e80b 100644 (file)
--- a/src/or/dns.c
+++ b/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[] =

diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 705c7b5e71f29258d0f5dcde7319792d8749b6e2..25a545ecc1003b0c9f611aad251bbd3ea8a17e18 100644 (file)
--- a/src/or/dnsserv.c
+++ b/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[] =

diff --git a/src/or/eventdns_tor.h b/src/or/eventdns_tor.h
index d8377246daa8b8479310039f7ffc30fec7838e40..77ccd1eb7c426c3c402bd6e8b94a422a4e15ce91 100644 (file)
--- a/src/or/eventdns_tor.h
+++ b/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

diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 8fade846c528125c1e8a1ee8a54de9eeaecc82a2..3c865134aafca69d3c5b635171555bc04528f108 100644 (file)
--- a/src/or/hibernate.c
+++ b/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[] =

diff --git a/src/or/main.c b/src/or/main.c
index ccf1e1c63781d5b3f152095785604ef6ff92e4bb..1bbd6cd11151a0a4a1b34f7f45ece30140467ac4 100644 (file)
--- a/src/or/main.c
+++ b/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[] =

diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index dadfbc54d47403e491765788c7770ee5886f87fb..c59baa13f735164c0b82a0cc73a7b3215222c2ac 100644 (file)
--- a/src/or/networkstatus.c
+++ b/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;

diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index 8e88b052b71427d358489eb84df6a098a9f001df..c312bbe72919afb3a3b86c24ad3f1d6cf19d1ffa 100644 (file)
--- a/src/or/ntmain.c
+++ b/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$ */
 

diff --git a/src/or/onion.c b/src/or/onion.c
index 642061fb8ef89aff9f6b0f7d9205353165408fa0..aa42ab6c669c8499eb0e60ba4862b0406d911bea 100644 (file)
--- a/src/or/onion.c
+++ b/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[] =

diff --git a/src/or/or.h b/src/or/or.h
index d4110769f4bce6279b74c964944cbc2688e0bf5f..82a4c421c2b5cb71d80be409e97f575424839919 100644 (file)
--- a/src/or/or.h
+++ b/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$ */
 

diff --git a/src/or/policies.c b/src/or/policies.c
index 4148fa471e2333157bcdf5785d168dbbe5f7f942..f4a685d117685e05e2099eafc2cc2d4dd3f2178d 100644 (file)
--- a/src/or/policies.c
+++ b/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[] = \

diff --git a/src/or/relay.c b/src/or/relay.c
index 95d30a98422020095242c90e7c0aebb0d66ce6b5..650a3d567aea5a2a41c157a3f4a57a98e6e601fb 100644 (file)
--- a/src/or/relay.c
+++ b/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[] =

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index e613230145802b1276dd1ae4bb04527e379319fa..517fea9ab65631c8874f48c4107771ffbd932a92 100644 (file)
--- a/src/or/rendclient.c
+++ b/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[] =

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 151ed1b23aba096684aa099e6494aa474c00431a..651c4926abc8439c8e74c4df80bf50d49d5c66d5 100644 (file)
--- a/src/or/rendcommon.c
+++ b/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[] =

diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 16dc2ceee1ae7f523d2229f2bc0739ead8b22554..5506547f95dc43a8ada1bebe4c840c08d9e5101b 100644 (file)
--- a/src/or/rendmid.c
+++ b/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[] =

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index e354e2baa948d9ef83e0b72ef7cd379017a29153..9fbd3017fe5cf82bb9d0140678dce366efd87c32 100644 (file)
--- a/src/or/rendservice.c
+++ b/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[] =

diff --git a/src/or/rephist.c b/src/or/rephist.c
index e1dfa2a795aebe2601d65ec6a52b94033678ac99..680ef01590d17f9a5ecb18d3f617983791ba6f33 100644 (file)
--- a/src/or/rephist.c
+++ b/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[] =

diff --git a/src/or/router.c b/src/or/router.c
index e9cc3901e743ac771857c46581a6103cb87d8d15..37f34439f570ad90d6ca5872b6e8fb8723de82b1 100644 (file)
--- a/src/or/router.c
+++ b/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[] =

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 141db022ace55b989c336217ca272e749af496fa..f8ad652eb53a8cc4674adbde01383de95fa5a1d8 100644 (file)
--- a/src/or/routerlist.c
+++ b/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[] =

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 4b25db74dd58416393dca029df71884221418ea5..18131b8e03cfbcdf6cb54f06701bd41b563c1694 100644 (file)
--- a/src/or/routerparse.c
+++ b/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[] =

diff --git a/src/or/test.c b/src/or/test.c
index 75af4aedfa8fd1b181037387775fa676bad8c865..7c6099e7cf48dcfbe51027ec47904242e8e65e77 100644 (file)
--- a/src/or/test.c
+++ b/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[] =

diff --git a/src/or/test_data.c b/src/or/test_data.c
index 174600a12b12e4e70155b0f49468358ff3379f41..46a6af085af55307c4d42598d0e2773f604d8504 100644 (file)
--- a/src/or/test_data.c
+++ b/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[] =

diff --git a/src/or/tor_main.c b/src/or/tor_main.c
index bafd8934547ca25e842068ad0b8ca1cd48d2d94d..17ef79aa2e7b41580c3daead3b96145039435105 100644 (file)
--- a/src/or/tor_main.c
+++ b/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[] =

diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index 68208f213f85618cdf6b3cfae254677b5d9d6de8..ee4c96f477f4a40882a687881d554c1c729f959d 100644 (file)
--- a/src/tools/tor-gencert.c
+++ b/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  $ */
 

diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index f387f9fa9f55c3849a1bd0613ff08d4bfcb74c86..d06e218873a9fd62d6e0a32bd4e58866f615c6c0 100644 (file)
--- a/src/tools/tor-resolve.c
+++ b/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$ */