aboutsummaryrefslogtreecommitdiff
path: root/src/or/cpuworker.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-03 11:53:28 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-03 11:53:28 -0500
commit8730884ebe8f30c69e361865ce25ad5c7b59805f (patch)
tree3913b4c569d6979b3e25d32435b41671f828e6f2 /src/or/cpuworker.c
parentda9190013510412cec00e38c064c5c718d032f9e (diff)
parent30b3475e6d5f5b644d4b607b343ff1da9540d178 (diff)
downloadtor-8730884ebe8f30c69e361865ce25ad5c7b59805f.tar
tor-8730884ebe8f30c69e361865ce25ad5c7b59805f.tar.gz
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/cpuworker.c')
-rw-r--r--src/or/cpuworker.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index cfe9f3af9..d6fd1217e 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -1,6 +1,6 @@
/* Copyright (c) 2003-2004, Roger Dingledine.
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
/* See LICENSE for licensing information */
/**