update copyright notices.

svn:r3982

Makefile.am

@@ -1,3 +1,9 @@
+# $Id$
+# Copyright 2002-2004 Roger Dingledine
+# Copyright 2004-2005 Roger Dingledine, Nick Mathewson
+# See LICENSE for licensing information
+
+
 AUTOMAKE_OPTIONS = foreign
  # else it keeps trying to put COPYING back in
 

configure.in

@@ -1,3 +1,7 @@
+dnl $Id$
+dnl Copyright 2001-2004 Roger Dingledine
+dnl Copyright 2004-2005 Roger Dingledine, Nick Mathewson
+dnl See LICENSE for licensing information
 
 AC_INIT
 AM_INIT_AUTOMAKE(tor, 0.1.0.2-rc)

contrib/TorControl.py

@@ -1,4 +1,6 @@
 #!/usr/bin/python
+# TorControl.py -- Python module to interface with Tor Control interface.
+# Copyright 2005 Nick Mathewson -- See LICENSE for licensing information.
 #$Id$
 
 import socket

contrib/osx/package.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2004 Nick Mathewson.
+# Copyright 2004-2005 Nick Mathewson.
 # See LICENSE in Tor distribution for licensing information.
 
 # This script builds a Macintosh OS X metapackage containing 4 packages:

src/common/aes.c

@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char aes_c_id[] = "$Id$";

src/common/aes.h

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

src/common/compat.c

@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 Roger Dingledine; Copyright 2004 Nick Mathewson */
+/* Copyright 2003-2004 Roger Dingledine
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char compat_c_id[] = "$Id$";

src/common/compat.h

@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 Roger Dingledine; Copyright 2004 Nick Mathewson */
+/* Copyright 2003-2004 Roger Dingledinex
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/container.c

@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 Roger Dingledine; Copyright 2004 Nick Mathewson */
+/* Copyright 2003-2004 Roger Dingledine
+   Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char container_c_id[] = "$Id$";

src/common/container.h

@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 Roger Dingledine; Copyright 2004 Nick Mathewson */
+/* Copyright 2003-2004 Roger Dingledine
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/crypto.c

@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char crypto_c_id[] = "$Id$";

src/common/crypto.h

@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/log.c

@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char log_c_id[] = "$Id$";

src/common/log.h

@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/test.h

@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine. */
+/* Copyright 2001,2002,2003 Roger Dingledine.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson *
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/common/torgzip.c

@@ -1,4 +1,5 @@
 /* Copyright 2004 Roger Dingledine */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char torgzip_c_id[] = "$Id$";

src/common/torgzip.h

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

src/common/torint.h

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

src/common/tortls.c

@@ -1,4 +1,5 @@
-/* Copyright 2003 Roger Dingledine. */
+/* Copyright 2003 Roger Dingledine.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char tortls_c_id[] = "$Id$";

src/common/tortls.h

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

src/common/util.c

@@ -1,4 +1,5 @@
-/* Copyright 2003 Roger Dingledine */
+/* Copyright 2003 Roger Dingledine
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char util_c_id[] = "$Id$";

src/common/util.h

@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 Roger Dingledine; Copyright 2004 Nick Mathewson */
+/* Copyright 2003-2004 Roger Dingledine
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/or/buffers.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char buffers_c_id[] = "$Id$";

src/or/circuitbuild.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuitbuild_c_id[] = "$Id$";

src/or/circuitlist.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuitlist_c_id[] = "$Id$";

src/or/circuituse.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char circuituse_c_id[] = "$Id$";

src/or/command.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char command_c_id[] = "$Id$";

src/or/config.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char config_c_id[] = "$Id$";

src/or/connection.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_c_id[] = "$Id$";

src/or/connection_edge.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_edge_c_id[] = "$Id$";
@@ -38,7 +38,7 @@ connection_close_unattached_ap(connection_t *conn, int endreason) {
 // be defined yet. -RD
     if (endreason == END_STREAM_REASON_ALREADY_SOCKS_REPLIED)
       log_fn(LOG_WARN,"Bug: stream (marked at %s:%d) sending two socks replies?",
-             conn->marked_for_close_file?conn->marked_for_close_file:"", 
+             conn->marked_for_close_file?conn->marked_for_close_file:"",
              conn->marked_for_close);
 
     if (conn->socks_request->command == SOCKS_COMMAND_CONNECT)

src/or/connection_or.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char connection_or_c_id[] = "$Id$";

src/or/control.c

@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char control_c_id[] = "$Id$";

src/or/cpuworker.c

@@ -1,5 +1,5 @@
 /* Copyright 2003-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char cpuworker_c_id[] = "$Id$";

src/or/directory.c

@@ -1,5 +1,5 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char directory_c_id[] = "$Id$";

src/or/dirserv.c

@@ -1,5 +1,5 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dirserv_c_id[] = "$Id$";

src/or/dns.c

@@ -1,5 +1,5 @@
 /* Copyright 2003-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char dns_c_id[] = "$Id$";

src/or/hibernate.c

@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char hibernate_c_id[] = "$Id$";

src/or/main.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char main_c_id[] = "$Id$";

src/or/onion.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char onion_c_id[] = "$Id$";

src/or/or.h

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

src/or/relay.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char relay_c_id[] = "$Id$";

src/or/rendclient.c

@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendclient_c_id[] = "$Id$";

src/or/rendmid.c

@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendmid_c_id[] = "$Id$";

src/or/rendservice.c

@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rendservice_c_id[] = "$Id$";

src/or/rephist.c

@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char rephist_c_id[] = "$Id$";

src/or/router.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char router_c_id[] = "$Id$";
@@ -614,7 +614,6 @@ int router_compare_to_my_exit_policy(connection_t *conn)
 
 }
 
-
 /** Return true iff <b>router</b> has the same nickname as this OR.  (For an
  * OP, always returns false.)
  */

src/or/routerlist.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char routerlist_c_id[] = "$Id$";

src/or/routerparse.c

@@ -1,6 +1,6 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char routerparse_c_id[] = "$Id$";

src/or/test.c

@@ -1,5 +1,5 @@
 /* Copyright 2001-2004 Roger Dingledine.
- * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char test_c_id[] = "$Id$";

src/or/tor_main.c

@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 Roger Dingledine. */
+/* Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004-2005 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char tor_main_c_id[] = "$Id$";

src/tools/tor-resolve.c

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