diff options
author | Nick Mathewson <nickm@torproject.org> | 2005-04-01 20:15:56 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2005-04-01 20:15:56 +0000 |
commit | 0e81265359514e767e732f790dd7b82e7cb3e002 (patch) | |
tree | 8eff685b8a5a222cf742d73428ff2d18abcee06a /src/or | |
parent | 34944f3eb10eb25ece93a257493020bf4d8f95b8 (diff) | |
download | tor-0e81265359514e767e732f790dd7b82e7cb3e002.tar.gz tor-0e81265359514e767e732f790dd7b82e7cb3e002.zip |
update copyright notices.
svn:r3982
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/buffers.c | 2 | ||||
-rw-r--r-- | src/or/circuitbuild.c | 2 | ||||
-rw-r--r-- | src/or/circuitlist.c | 2 | ||||
-rw-r--r-- | src/or/circuituse.c | 2 | ||||
-rw-r--r-- | src/or/command.c | 2 | ||||
-rw-r--r-- | src/or/config.c | 2 | ||||
-rw-r--r-- | src/or/connection.c | 2 | ||||
-rw-r--r-- | src/or/connection_edge.c | 4 | ||||
-rw-r--r-- | src/or/connection_or.c | 2 | ||||
-rw-r--r-- | src/or/control.c | 2 | ||||
-rw-r--r-- | src/or/cpuworker.c | 2 | ||||
-rw-r--r-- | src/or/directory.c | 2 | ||||
-rw-r--r-- | src/or/dirserv.c | 2 | ||||
-rw-r--r-- | src/or/dns.c | 2 | ||||
-rw-r--r-- | src/or/hibernate.c | 2 | ||||
-rw-r--r-- | src/or/main.c | 2 | ||||
-rw-r--r-- | src/or/onion.c | 2 | ||||
-rw-r--r-- | src/or/or.h | 2 | ||||
-rw-r--r-- | src/or/relay.c | 2 | ||||
-rw-r--r-- | src/or/rendclient.c | 2 | ||||
-rw-r--r-- | src/or/rendmid.c | 2 | ||||
-rw-r--r-- | src/or/rendservice.c | 2 | ||||
-rw-r--r-- | src/or/rephist.c | 2 | ||||
-rw-r--r-- | src/or/router.c | 3 | ||||
-rw-r--r-- | src/or/routerlist.c | 2 | ||||
-rw-r--r-- | src/or/routerparse.c | 2 | ||||
-rw-r--r-- | src/or/test.c | 2 | ||||
-rw-r--r-- | src/or/tor_main.c | 3 |
28 files changed, 30 insertions, 30 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 34ee95d7d0..2a4342e3ef 100644 --- a/src/or/buffers.c +++ b/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$"; diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index b91281f25a..9dced9354b 100644 --- a/src/or/circuitbuild.c +++ b/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$"; diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 1f08f197f1..563e01c190 100644 --- a/src/or/circuitlist.c +++ b/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$"; diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 255b4a306c..91da4ff266 100644 --- a/src/or/circuituse.c +++ b/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$"; diff --git a/src/or/command.c b/src/or/command.c index 475bb23c94..a8caed528c 100644 --- a/src/or/command.c +++ b/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$"; diff --git a/src/or/config.c b/src/or/config.c index d452bc57f9..d143d85064 100644 --- a/src/or/config.c +++ b/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$"; diff --git a/src/or/connection.c b/src/or/connection.c index df70c6a6b4..ee51ef8d9c 100644 --- a/src/or/connection.c +++ b/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$"; diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index f381f432e8..23293819d3 100644 --- a/src/or/connection_edge.c +++ b/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) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 82c93d09d7..79e8a9dee9 100644 --- a/src/or/connection_or.c +++ b/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$"; diff --git a/src/or/control.c b/src/or/control.c index 71b60804ca..b59940734e 100644 --- a/src/or/control.c +++ b/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$"; diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 5b65835ecc..b6e8ca6c9d 100644 --- a/src/or/cpuworker.c +++ b/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$"; diff --git a/src/or/directory.c b/src/or/directory.c index ed6a10cd8c..b9a0854ccf 100644 --- a/src/or/directory.c +++ b/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$"; diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 6eb1499e09..76cb97c6b2 100644 --- a/src/or/dirserv.c +++ b/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$"; diff --git a/src/or/dns.c b/src/or/dns.c index 3913ef5df7..b595668f53 100644 --- a/src/or/dns.c +++ b/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$"; diff --git a/src/or/hibernate.c b/src/or/hibernate.c index b44c03e6fa..df3e83bd51 100644 --- a/src/or/hibernate.c +++ b/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$"; diff --git a/src/or/main.c b/src/or/main.c index 12d923b9bc..393e5a69e2 100644 --- a/src/or/main.c +++ b/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$"; diff --git a/src/or/onion.c b/src/or/onion.c index 642d632546..4d354abbd7 100644 --- a/src/or/onion.c +++ b/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$"; diff --git a/src/or/or.h b/src/or/or.h index 63b3ea9c56..3b9dcbb48d 100644 --- a/src/or/or.h +++ b/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$ */ diff --git a/src/or/relay.c b/src/or/relay.c index 4b79f17463..f2523b5a25 100644 --- a/src/or/relay.c +++ b/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$"; diff --git a/src/or/rendclient.c b/src/or/rendclient.c index b874802666..6791bbd3e4 100644 --- a/src/or/rendclient.c +++ b/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$"; diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 302a6f011f..90881959fa 100644 --- a/src/or/rendmid.c +++ b/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$"; diff --git a/src/or/rendservice.c b/src/or/rendservice.c index d9f637c396..ae435a2292 100644 --- a/src/or/rendservice.c +++ b/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$"; diff --git a/src/or/rephist.c b/src/or/rephist.c index bc9861b255..26efd9e622 100644 --- a/src/or/rephist.c +++ b/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$"; diff --git a/src/or/router.c b/src/or/router.c index b30808a967..2e7aa5eff3 100644 --- a/src/or/router.c +++ b/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.) */ diff --git a/src/or/routerlist.c b/src/or/routerlist.c index c5b99a8745..d8dc2873ed 100644 --- a/src/or/routerlist.c +++ b/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$"; diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 75d91b0384..30c6add211 100644 --- a/src/or/routerparse.c +++ b/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$"; diff --git a/src/or/test.c b/src/or/test.c index 3f743385d1..822c56b430 100644 --- a/src/or/test.c +++ b/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$"; diff --git a/src/or/tor_main.c b/src/or/tor_main.c index 0b44625315..26c260c92c 100644 --- a/src/or/tor_main.c +++ b/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$"; |