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

svn:r12786

36 files changed, 79 insertions, 44 deletions

diff --git a/src/or/buffers.c b/src/or/buffers.c
index cc4b39307..e22cf11fe 100644
--- 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 22d9c912d..aff1de167 100644
--- 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 0051d46df..375156b4e 100644
--- 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 4289e0f62..5bad9e65f 100644
--- 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 fe1a3594d..b39080429 100644
--- 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 f4d245117..12be45826 100644
--- 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 a39d5d710..ba0bd63e7 100644
--- 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 f62984259..54c6f87d7 100644
--- 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 2540df2ff..c4f61577d 100644
--- 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 468b622b5..680973b99 100644
--- 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 2fb0e7d2a..b1f56d3db 100644
--- 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 628c94e24..ba3f675f9 100644
--- 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 83cbbf630..c8d7b513b 100644
--- 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 49c3f7454..364dc49a4 100644
--- 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 1e0dcb253..b4b86502f 100644
--- 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 705c7b5e7..25a545ecc 100644
--- 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 d8377246d..77ccd1eb7 100644
--- 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 8fade846c..3c865134a 100644
--- 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 ccf1e1c63..1bbd6cd11 100644
--- 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 dadfbc54d..c59baa13f 100644
--- 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 8e88b052b..c312bbe72 100644
--- 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 642061fb8..aa42ab6c6 100644
--- 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 d4110769f..82a4c421c 100644
--- 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 4148fa471..f4a685d11 100644
--- 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 95d30a984..650a3d567 100644
--- 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 e61323014..517fea9ab 100644
--- 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 151ed1b23..651c4926a 100644
--- 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 16dc2ceee..5506547f9 100644
--- 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 e354e2baa..9fbd3017f 100644
--- 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 e1dfa2a79..680ef0159 100644
--- 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 e9cc3901e..37f34439f 100644
--- 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 141db022a..f8ad652eb 100644
--- 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 4b25db74d..18131b8e0 100644
--- 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 75af4aedf..7c6099e7c 100644
--- 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 174600a12..46a6af085 100644
--- 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 bafd89345..17ef79aa2 100644
--- 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[] =