diff --git a/LICENSE b/LICENSE
index 19031d2d430105deb1cd3f1fcb8e5da1e1124d05..bf90e614aea26bf9f548bff1710187882c422032 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,7 +13,7 @@ Tor is distributed under this license:
 
 Copyright (c) 2001-2004, Roger Dingledine
 Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
-Copyright (c) 2007-2011, The Tor Project, Inc.
+Copyright (c) 2007-2012, 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/acinclude.m4 b/acinclude.m4
index ccfecff28de51eec238a7257e8471b845a43540b..cb33dc36cfe07584a0094dd2383bbce9d31e41f2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2,6 +2,7 @@ dnl Helper macros for Tor configure.in
 dnl Copyright (c) 2001-2004, Roger Dingledine
 dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2008, Roger Dingledine, Nick Mathewson
+dnl Copyright (c) 2007-2012, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_DEFUN([TOR_EXTEND_CODEPATH],
diff --git a/configure.in b/configure.in
index 43c9bb2a5e6412fc665286706bcce7dd532498af..0f31071a4dcacb906eb97eae66013c2e6fb015ca 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Copyright (c) 2001-2004, Roger Dingledine
 dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
-dnl Copyright (c) 2007-2008, The Tor Project, Inc.
+dnl Copyright (c) 2007-2012, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_INIT
diff --git a/src/common/address.c b/src/common/address.c
index e444ef19348e21201435f31de4aa9d063ffbf244..c734c6fbf471de16edc9a887d1db0df649d9c842 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/address.h b/src/common/address.h
index 2afec564be0af157a74404b87d3fe7221b8e1b70..e942949bf2c8a6fa058cccf3aa37c9b326e4ea6f 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/aes.c b/src/common/aes.c
index 1cb6b86a82768225e3839cb9452ee4b32ca14e97..59d864a3d0be981f39f4387d8d9fe8900b5efe9d 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/aes.h b/src/common/aes.h
index 04b424ec77c8f36a369bece648716bccb84d5193..bde567f87fa13ac92424461a943a60c6c89a5481 100644
--- a/src/common/aes.h
+++ b/src/common/aes.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /* Implements a minimal interface to counter-mode AES. */
diff --git a/src/common/compat.c b/src/common/compat.c
index ed6886ce363200a504d786687e3573344127541d..629304377f577e7b0dfcc7f7eb439f565af94d8a 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/compat.h b/src/common/compat.h
index 7ba350945ae74f4c2e8413cb5b470c622f988804..23081ac4951df56d6b052d14f7e3f6ea260e5e47 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #ifndef _TOR_COMPAT_H
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index e522a8f579aad0b6f8a2f9c2d7e9d5b4bcf1c024..9f7ac632397d515e002e423c3c42fdbabaaf07ad 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, The Tor Project, Inc. */
+/* Copyright (c) 2009-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h
index 95f633aaaa5a50ca83b27197c4b1daebe3717230..af819dbc976ffe76fa39a26ab0ac44d4595494e6 100644
--- a/src/common/compat_libevent.h
+++ b/src/common/compat_libevent.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, The Tor Project, Inc. */
+/* Copyright (c) 2009-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #ifndef _TOR_COMPAT_LIBEVENT_H
diff --git a/src/common/container.c b/src/common/container.c
index 23ec9d3c85fcd0a6bb18a88bc92ed97722abe7d7..d92f825784b131174fdc5009b32f4eb570cbaaaf 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/container.h b/src/common/container.h
index 4e14ab4e3465abc34e5cf4446ad4bc3a399aaf07..c11c2eb82f2c1df93d3f9213a53c4402d9c657cb 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #ifndef _TOR_CONTAINER_H
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 86f19dfb6a9e2715cea52d97fd7818c891099041..9073d8179def10c4bd3baae312bab3b4e04e4d8b 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 0482e1af65ef5f6199a05e4292e31abc3f8ef86b..76bcbf7d43c6b264fdc60b23e851fcd95a7332a4 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/di_ops.c b/src/common/di_ops.c
index b22a58d1b15cae1951b1a0f6fb6ab5c2b3b31aa6..7683c59dee1aeff9cb67dabf587c52fe5e175ad6 100644
--- a/src/common/di_ops.c
+++ b/src/common/di_ops.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, The Tor Project, Inc. */
+/* Copyright (c) 2011-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/di_ops.h b/src/common/di_ops.h
index fa7d86806a0679dc061e8d0848f5982e55e39bbb..8f0bb698f9e031e8a8f5277bbffa5b28f792dd2f 100644
--- a/src/common/di_ops.h
+++ b/src/common/di_ops.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/ht.h b/src/common/ht.h
index 0783cb1e75178eb2d166256eced53f2eba14912a..25156c4165b97d6107703a06d019bbbcccbf7ff5 100644
--- a/src/common/ht.h
+++ b/src/common/ht.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002, Christopher Clark.
  * Copyright (c) 2005-2006, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See license at end. */
 
 /* Based on ideas by Christopher Clark and interfaces from Niels Provos. */
diff --git a/src/common/log.c b/src/common/log.c
index f0384a77e02be3cc2fbc2e0f62f4f144017d8823..37c7a148f02d25ea7a718542a378ab3883c71436 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/memarea.c b/src/common/memarea.c
index a6b8c4ee9c98e5c4784ce5e82a7c6ee9547cf803..07bd593cc9d160b62294083ad06f71d15999b2cb 100644
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, The Tor Project, Inc. */
+/* Copyright (c) 2008-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /** \file memarea.c
diff --git a/src/common/memarea.h b/src/common/memarea.h
index 4d31dc95a87d16fc3852895380e819ae0ba4f451..b3c76d8d0cc592fe4cc137cb4801e74a43f6a6f0 100644
--- a/src/common/memarea.h
+++ b/src/common/memarea.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, The Tor Project, Inc. */
+/* Copyright (c) 2008-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* Tor dependencies */
 
diff --git a/src/common/mempool.c b/src/common/mempool.c
index 1462c5f8fe42300b7edfebf606e844f7564d3565..2416bce473bb75a08e394dc86213f07ff2aeb1c8 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011, The Tor Project, Inc. */
+/* Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 #if 1
 /* Tor dependencies */
diff --git a/src/common/mempool.h b/src/common/mempool.h
index fb1e9e8b424308ed3c9a606f5da7c3bc337d7a51..d0a7bc2f3605be2f6aff9856ac73fa70bb7b6675 100644
--- a/src/common/mempool.h
+++ b/src/common/mempool.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011, The Tor Project, Inc. */
+/* Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/procmon.h b/src/common/procmon.h
index 3bf60448c197833eaa7567a3fe58ab1d9b392f48..88d64d6a15307eceac73b81ff32b29fb44cac91a 100644
--- a/src/common/procmon.h
+++ b/src/common/procmon.h
@@ -1,3 +1,5 @@
+/* Copyright (c) 2011-2012, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
 
 /**
  * \file procmon.h
diff --git a/src/common/sha256.c b/src/common/sha256.c
index 258b7e062a1f58821a22cadce46e88be704e8e3c..813c68d2a3280a68ee37052d3df3a26f75794b78 100644
--- a/src/common/sha256.c
+++ b/src/common/sha256.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, The Tor Project, Inc. */
+/* Copyright (c) 2009-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* This SHA256 implementation is adapted from the public domain one in
    LibTomCrypt, version 1.6.  Tor uses it on platforms where OpenSSL doesn't
diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index 62e4a0703595f137c4f9611ea4e8e2e56da46722..da4136228e65d4b4afda7dc57fcae376612b1621 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/torgzip.h b/src/common/torgzip.h
index 15e09eb700746e1615197f1df071f378d5af9092..d3ded81f9c13a9a1fb9216a17ed684a2e3b66f0d 100644
--- a/src/common/torgzip.h
+++ b/src/common/torgzip.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/torint.h b/src/common/torint.h
index af975471f1c36e4207e1e9b7b9639ebee0767ce4..09495ac58808a3d679cde990c359824b091bf33f 100644
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/torlog.h b/src/common/torlog.h
index d6b21dfd89607c656e88449c81eb2bea824b7dfd..28890a44afddad8b7f84fff7e3cce76ad5078878 100644
--- a/src/common/torlog.h
+++ b/src/common/torlog.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 06f645011f468f60679941795072c37f86583f1e..634589b1ccc3edc3f870481e8efc363533b2460f 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/tortls.h b/src/common/tortls.h
index bcec63f059e1082f5f54cf5a59ef63e26224f7f0..491a5419dfe26fa8ed577a9fd8743fe23a00966a 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #ifndef _TOR_TORTLS_H
diff --git a/src/common/util.c b/src/common/util.c
index e0de262078c5672ba673d295bd826927369a041a..09cb2e966fa7da863cf4a960fd9e6aac8d1d1bc9 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/util.h b/src/common/util.h
index de22e186c7ff26514d98f8dcc5b6d91d190d49c5..cbc0fb2d2eca6a7bc5a917422649dc8a0e835eb1 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/buffers.c b/src/or/buffers.c
index cdda5f06c4781479aaf404d277c90d20c1b200e9..be1bdd34e95288db5fc5155544c129746e435c3e 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/buffers.h b/src/or/buffers.h
index 7b2a2acc3c3888795347ad198de19105785f8ee3..a5886adc7ad3160efc6c836dc4e3dd96a7f5656f 100644
--- a/src/or/buffers.h
+++ b/src/or/buffers.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index cc162f22c4e520b2dd93910022c6e9d0bc2d8b77..7c4d04dc523a8a6df34a2fcb33c0d789e0ef8f94 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h
index 27732da8f01549fc4603c092a0567cadcef28bb8..5b773990308934079712981c1b863abcd1bc3a2f 100644
--- a/src/or/circuitbuild.h
+++ b/src/or/circuitbuild.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 85f529194b3c5ebddd7a909324326edfeaaddc30..5e3370adcee71f3eb2c02bda9039c2e6904e6c4e 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1,7 +1,7 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h
index e2298c69af293054d2ee1d84d67f9a18c35e4832..6e7735476b37a56a42b9801f20f52a31fa629336 100644
--- a/src/or/circuitlist.h
+++ b/src/or/circuitlist.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 6f4202ea218d2c69892fa050cc0133116c8421b6..f43ce19c836aaa64c79039091af693307b026dca 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuituse.h b/src/or/circuituse.h
index 78948b5f9ef923433555760ca268c6f3ede0cd41..be2bd7ec519600ecf3a20462aa5a7dae469c814a 100644
--- a/src/or/circuituse.h
+++ b/src/or/circuituse.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/command.c b/src/or/command.c
index 4e56edd5dbc1242c04d3dbe975a53d64a3ec54a2..abf664c1e2a5f733fac2228aa8f5fc287746cf74 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/command.h b/src/or/command.h
index 95b0f3a93197f1cf07afbc7fa97da7f49f92443c..078ccc9f5de663acd2277da970188e8547e1d860 100644
--- a/src/or/command.h
+++ b/src/or/command.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/config.c b/src/or/config.c
index 160ee9a94795331440e611f841c8f110eab74283..ac505c08913b634daab9e9f5c75822d209a114be 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
@@ -2809,7 +2809,7 @@ print_usage(void)
   printf(
 "Copyright (c) 2001-2004, Roger Dingledine\n"
 "Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson\n"
-"Copyright (c) 2007-2011, The Tor Project, Inc.\n\n"
+"Copyright (c) 2007-2012, The Tor Project, Inc.\n\n"
 "tor -f <torrc> [args]\n"
 "See man page for options, or https://www.torproject.org/ for "
 "documentation.\n");
diff --git a/src/or/config.h b/src/or/config.h
index a68a3e3113a1fa4c4c5c41929501bf68a74d0c97..ce7e319746199c456ac2609e8305a1eb4c9c99d3 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/connection.c b/src/or/connection.c
index 5d32a0633d6180f37ea635e49d2080de05c72c31..35c79b950414a1779a3e876fc0b69ee2e9d2910c 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/connection.h b/src/or/connection.h
index 215eb1b780192282e22be808ca1521a8567460d4..785625e44b4d1bcf50cc002170074779796ad4f1 100644
--- a/src/or/connection.h
+++ b/src/or/connection.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 5ae5b175a65f69b52ca76f821eff2fbbe2d05b5b..51bd1ef6b6c2721b1679ad81355760ce6fd93846 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h
index f6db4b4ef96cbb7169618e69aeed1903172120e1..78baf75b680f0e6c129c12a8ddb0789978cb2f40 100644
--- a/src/or/connection_edge.h
+++ b/src/or/connection_edge.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index b5339ad71c1920928050980b5031cde7fe5fc045..b5ef4825daa21acf4b50387b5d803967afc108f7 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/connection_or.h b/src/or/connection_or.h
index e5093f5ead37650b97edb9900410c7502d99e71a..3e98f5cce1afa72125b20067ef00668426f848b4 100644
--- a/src/or/connection_or.h
+++ b/src/or/connection_or.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/control.c b/src/or/control.c
index 53ea85de620b4133f028c569c61c76e1f46df5c0..9c92dfccdc02afafc6e36f0de6c224f9dfbd38b9 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/control.h b/src/or/control.h
index 8786712abd3676d90ee0579b28ccbbe174b7b559..f301ce91be0a987af0203b78fe615ae2dd451242 100644
--- a/src/or/control.h
+++ b/src/or/control.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index 411d9bbb5b3640f9f810b501a18a9634b0a4b003..9d48dd7cf76412ca02f4223cebe4d53292a88517 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-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/cpuworker.h b/src/or/cpuworker.h
index 04e37ee4590bb886496e35c7216eaa706ffdd5c5..91172caa56acc14161c0bc79e72ed1191507c51c 100644
--- a/src/or/cpuworker.h
+++ b/src/or/cpuworker.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/directory.c b/src/or/directory.c
index 60a1963ee60bcadbc72151baa6bb0092a7ffa522..ee05ff897c18321aed775958e96b44c3d3f2568a 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "or.h"
diff --git a/src/or/directory.h b/src/or/directory.h
index 5050f700d2c00a91454cec400a666123c425737d..584fe8431182779fb0d513d351005693bbd3ec6b 100644
--- a/src/or/directory.h
+++ b/src/or/directory.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index ec8d9ece37ab08e9717cd03773b55c11fe861586..01a561859708feddc6df59138a49f4677265113e 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #define DIRSERV_PRIVATE
diff --git a/src/or/dirserv.h b/src/or/dirserv.h
index 3ff08157e0bc28a3a7e3bc727d0e5ccfcadd6a20..22269b200939387d022b84b9d4c576116b7203d8 100644
--- a/src/or/dirserv.h
+++ b/src/or/dirserv.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index e2be2397af466bc8442d75e049971eafb9194ed1..c5bd213e531a9ce6516012fb02ed8cf730104064 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #define DIRVOTE_PRIVATE
diff --git a/src/or/dirvote.h b/src/or/dirvote.h
index 2c8dcff963f4b28c4d0b3acf0ff1af693d0475be..e6f9700614607023e3e316f89f8302eeac35261e 100644
--- a/src/or/dirvote.h
+++ b/src/or/dirvote.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/dns.c b/src/or/dns.c
index b349f02f685b7c8e77196155b919ec167262ff57..77c1a21d213450c97cc7d97f64a9cd4109a34e41 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/dns.h b/src/or/dns.h
index 25ff86e2c6f5191e7bbf8cbcfbf2607b502ef5a4..8c8b476ac888940e0fe7582152ef79638c138ec4 100644
--- a/src/or/dns.h
+++ b/src/or/dns.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 7f519398faf3acd6ece483bb352d9ca833a94b87..183c5b8d4a5d913459bb0dcfb4b5e46b85f7279f 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011, The Tor Project, Inc. */
+/* Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/dnsserv.h b/src/or/dnsserv.h
index 73ec365647bc306046a11fb681d9d96fd22904f7..3aaa038d2ba35fcd5046b0895c5f76a0ff190abe 100644
--- a/src/or/dnsserv.h
+++ b/src/or/dnsserv.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/eventdns_tor.h b/src/or/eventdns_tor.h
index c75cff2d1fb8f197ee0ecb6eac538824988f662c..4c40b3524b2140790d0840acda71dc446019fe26 100644
--- a/src/or/eventdns_tor.h
+++ b/src/or/eventdns_tor.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011, The Tor Project, Inc. */
+/* Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/or/geoip.c b/src/or/geoip.c
index 7f16a87df96bc8a32a4ddc06aec2dfb6b1b8483a..68a1942898fe5b7dc738a0ac4f429df226ecb23b 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011, The Tor Project, Inc. */
+/* Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/geoip.h b/src/or/geoip.h
index 7c2eddce9940c9b1c126224692ab0288ca3c6e19..4aed4e07bbbb66070e3000fb0bf290ebce00b435 100644
--- a/src/or/geoip.h
+++ b/src/or/geoip.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index c4a7d375114c61c86447b92cb3878efa6e187dc7..3a9c1e4224b015093d46c355d82fa2394127a4f9 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/hibernate.h b/src/or/hibernate.h
index d77e946d4f2aa1fb0f242b16f822f5e2a0f25cd0..9aa026b7b04e911b3987d602200086a1e1c97a82 100644
--- a/src/or/hibernate.h
+++ b/src/or/hibernate.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/main.c b/src/or/main.c
index 8fbba770a56917a305dd0e6318f37c498906fda9..163dd5d0fbbb1b7647835b68200b4e0f20d5e1f0 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/main.h b/src/or/main.h
index c8903642deb468b52221cfa38e1c62be36a84a51..f843b6f9fcdd6516285c79ea15a77c64ac7f15cb 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index 7bd0a03101377b3be583f27ac27dff351f9998fa..ba6c88f8a0a596016224434b2633d5fa883c687a 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, The Tor Project, Inc. */
+/* Copyright (c) 2009-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "or.h"
diff --git a/src/or/microdesc.h b/src/or/microdesc.h
index 4564132810437fa929b0bd174eedaae1c8b6fe59..5646fc7a8534ecdb30edf2fbf08c98a17ddf45f7 100644
--- a/src/or/microdesc.h
+++ b/src/or/microdesc.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 029fbe7eed984dba9a4076de56d2aa9646e049e8..efa872f093591064ca2f0f1ced68752b0b77aec3 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h
index 1b10f27388eede7b8ce1db5369eeca0849822759..0af17512dd087fb692bd1c1ce2c604c148eea1a2 100644
--- a/src/or/networkstatus.h
+++ b/src/or/networkstatus.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 4654f307e38280736798896567357fd4c43ca631..f7f3024179cc1e98ced741f81342b8b6c1cbfc09 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "or.h"
diff --git a/src/or/nodelist.h b/src/or/nodelist.h
index 1b7549dade1b1602a461b2159cc7d2e56a4384e1..1e9da88d4ec6bce608532321e2f924714a09de29 100644
--- a/src/or/nodelist.h
+++ b/src/or/nodelist.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index bd07df1b3ef96fe836b72bba7a7999bf817b1410..01244c4c08933995aa9f6fe7906338b61223985d 100644
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #define MAIN_PRIVATE
diff --git a/src/or/ntmain.h b/src/or/ntmain.h
index 6d95a0987d1859079a335df8722311ff0301c008..07fdcf466b1c99c259d22c502f042d53e098265b 100644
--- a/src/or/ntmain.h
+++ b/src/or/ntmain.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/onion.c b/src/or/onion.c
index 43f0765dab25d16eec29ce64b01a0fe79862c5c6..ff1556c3e163e0fe579dc1b977a43b94f12160eb 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/onion.h b/src/or/onion.h
index 4b2de792a1f8af3b39eaffa2a3179120a0538041..7e0f873c737982e2eb25e92a2bcecf0be7a0a0c4 100644
--- a/src/or/onion.h
+++ b/src/or/onion.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/or.h b/src/or/or.h
index a01c14a7231039ba777af5f6325e86993cf8608b..4d5fdf408e197b2380d9265b845bb49f7e24b357 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/policies.c b/src/or/policies.c
index 62bdc1eb9def443053190bb7c73ce41cf2eb95cd..b2b962dfd7bf6c496aa5166d562a04e121a28783 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/policies.h b/src/or/policies.h
index 51716ab0a71eab7107cd29599fee40362e659ede..31f3f06c7d348910fbb1d479f59403057f5eca61 100644
--- a/src/or/policies.h
+++ b/src/or/policies.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/reasons.c b/src/or/reasons.c
index bcf15ff8f44a4a3bd7850370c248e05393a2f549..227ae8c6e39898b4d88ac2d8a30d1a6b24ad292f 100644
--- a/src/or/reasons.c
+++ b/src/or/reasons.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/reasons.h b/src/or/reasons.h
index 01f9717948b3214425e6768d8ad6f0704f1bf58c..377b61b1136f33f727d4d2459d86007d15105987 100644
--- a/src/or/reasons.h
+++ b/src/or/reasons.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/relay.c b/src/or/relay.c
index 003a07f98a35c5e176fcffee96924733d5645f87..c8dbb2e268374a4698f10b5898d1977a1778d86a 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/relay.h b/src/or/relay.h
index 1cd4008bb913ce4717091af4a69866f20b162a8d..6a54373654d603ca0ac1546a8544311a1e8c25ee 100644
--- a/src/or/relay.h
+++ b/src/or/relay.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index da32791f001e9ddc7c007c3ec28376b7baedff0f..79e017b0c0540c1885c2507d58302b44bcb68014 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendclient.h b/src/or/rendclient.h
index 89da47789a8e450673606e54035c416b1a45d07b..393b556e32dbf7b9b8d30e67d46ac69e58d4d652 100644
--- a/src/or/rendclient.h
+++ b/src/or/rendclient.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 0f78a7b0d84a8c3c7160556cde90c5e6f250b1c1..e401a1612321883ec8948279f0e1be449154a1bd 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h
index e633155038fbe4833511b81dea418701e0b7e4d9..be6bd13d2cd497b6bd4ed2a7426c64ba4a6c288e 100644
--- a/src/or/rendcommon.h
+++ b/src/or/rendcommon.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 894bbb3c5456d0a61840110150fc62f04ee10739..bacd0ef93e656ace9b21536f137f45cd91afcd51 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendmid.h b/src/or/rendmid.h
index 5ed87fd2b184e1332ebec713b95c15d1179fa033..0af6436deab0edbcd183ed2c101960576026bb4a 100644
--- a/src/or/rendmid.h
+++ b/src/or/rendmid.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index f2fc6a7837656c77640256f8164ee1decd4b8a34..5ffc58625efcc1dea006447b383cbbb03f2aa2ab 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendservice.h b/src/or/rendservice.h
index 8a2994c4c05fcf23478f40bc88350fd05d997379..e5848785a813ab06017138c14a79a1a881e82e28 100644
--- a/src/or/rendservice.h
+++ b/src/or/rendservice.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rephist.c b/src/or/rephist.c
index e1383bc2bbc032fcf8b8af23c9a40596d48a787f..30c8a04c09ce258d2f283e0368f6e1d3a7ae7c95 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rephist.h b/src/or/rephist.h
index 860713c350e2fd11b82d518bcc9d0dbefa8a8b06..d47724edb55968140d632562776eec071e747d01 100644
--- a/src/or/rephist.h
+++ b/src/or/rephist.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/router.c b/src/or/router.c
index fc7cf73cf15e024a3ceaa0cdc369350c0fb4d294..cb9a3b1abbdcd9ec27296cc14f971e736b908a91 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #define ROUTER_PRIVATE
diff --git a/src/or/router.h b/src/or/router.h
index 294736e70ce48707246d05b7391d6e865f95258e..69805d6f2de477d42a1373ad6a8c842d264bc038 100644
--- a/src/or/router.h
+++ b/src/or/router.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 9e5fff4ce3fa7ee590c88a4311065fd4271d893a..42063f2c84b08fbcd4dc03a25ce276c92c9f5d21 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/routerlist.h b/src/or/routerlist.h
index ee665b61051eff34510ffc96abadd50c341a38f2..3aee0f8bbefc9683c483005057fe3dafc1f6f3e6 100644
--- a/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index dbc6bf1542ff9f369c69d5d3380a701ca630b484..b44bd0c42630bb3eb0beb84d645ce457e5bb3043 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/routerparse.h b/src/or/routerparse.h
index 6486a09c73adf7f07514d758ad8ae05e59a0148d..c6382a7f6be033b359371e7a1adfac63aee95ba7 100644
--- a/src/or/routerparse.h
+++ b/src/or/routerparse.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/status.c b/src/or/status.c
index 3e4cb779a3aa9f2e81746600a42eea37ce4c06af..04cd96eed50257fdceb85467e4e2a0e656044926 100644
--- a/src/or/status.c
+++ b/src/or/status.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011, The Tor Project, Inc. */
+/* Copyright (c) 2010-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/status.h b/src/or/status.h
index ac726a1d2d22db79d86ae6cb227962a7f4ee5a18..189ac789e19be8664042e37b447441ca28bf006d 100644
--- a/src/or/status.h
+++ b/src/or/status.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, The Tor Project, Inc. */
+/* Copyright (c) 2010-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #ifndef _TOR_STATUS_H
diff --git a/src/or/tor_main.c b/src/or/tor_main.c
index 1ce14ab76811e51ad4601f34a518a0ed20201d6c..2f4922317db88f968963172b4dd1284317e09714 100644
--- a/src/or/tor_main.c
+++ b/src/or/tor_main.c
@@ -1,6 +1,6 @@
 /* Copyright 2001-2004 Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /** String describing which Tor subversion repository version the source was
diff --git a/src/or/transports.c b/src/or/transports.c
index a20decfc03904b72426731d152f7da53ed40ac8e..2fc2adc55ecb8bfb5b91b5b3b3e002c1ff2cb14e 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, The Tor Project, Inc. */
+/* Copyright (c) 2011-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/transports.h b/src/or/transports.h
index 314af2b3a02922823ee3b8f05abc1ff465eb208f..02f159a5d63b2b742296bf55a9229ac9955c1375 100644
--- a/src/or/transports.h
+++ b/src/or/transports.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/test/bench.c b/src/test/bench.c
index 3081814802c5d53cfd8df63348af087a72ab9378..3eae532d306ff4f75862cedb5d8211f19130c25e 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /* Ordinarily defined in tor_main.c; this bit is just here to provide one
diff --git a/src/test/test-child.c b/src/test/test-child.c
index b57d8caa904fa9a549de40332cbf0beb5b60ccca..c5725f1c5a2293cf77c5f1db530c43f2893c35e2 100644
--- a/src/test/test-child.c
+++ b/src/test/test-child.c
@@ -1,3 +1,6 @@
+/* Copyright (c) 2011-2012, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
 #include <stdio.h>
 #include "orconfig.h"
 #ifdef _WIN32
diff --git a/src/test/test.c b/src/test/test.c
index c2dba924e4aa7334e121b986cbd6fa6a7d83be64..5f0b47000c56e10c259927fdee96b12d72e1ae51 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /* Ordinarily defined in tor_main.c; this bit is just here to provide one
diff --git a/src/test/test.h b/src/test/test.h
index 4d5117aea79a3b5e2b605d97f801c2e5417dc827..0b6e6c60cb8fd858f09e1af02e760a33f8503ce3 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2003, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #ifndef _TOR_TEST_H
diff --git a/src/test/test_addr.c b/src/test/test_addr.c
index 3838b8072b11098caa275fda2892f8e773112533..9007a23c5c6c70d478841f7d432df466cfe234ca 100644
--- a/src/test/test_addr.c
+++ b/src/test/test_addr.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/test/test_config.c b/src/test/test_config.c
index d8161de14c11d2e49a46de7fa94133515e261434..77398e653c35d9cdbf57143abb198c47f57ca4ef 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/test/test_containers.c b/src/test/test_containers.c
index b5b0ef36e04f2548fac8006f82a3fa44b01bea02..615c489f411ddb499de2a86e992e401db8eab247 100644
--- a/src/test/test_containers.c
+++ b/src/test/test_containers.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index 95a33613afd6134eb34d959af320c6156ed9594d..7f4347a41c4e0481668c28008a1a5cd8da03d06e 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/test/test_data.c b/src/test/test_data.c
index fc85857615de21dcbda32b58ff33425c7483d790..de2f9f58ebe7971981b248e6472d5923d77a77f3 100644
--- a/src/test/test_data.c
+++ b/src/test/test_data.c
@@ -1,6 +1,6 @@
 /* Copyright 2001-2004 Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /** First of 3 example authority certificates for unit testing. */
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 0ed54c33d085deb48d4111552d3420b934ec11a8..83c612045b0a2165a20c4ca7debcf79d14288bf7 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c
index 9326c035fe5b70c8d941f4c47c22261ef61d47c9..89c578f4a78b8275b038ebb6366b1c60d8627505 100644
--- a/src/test/test_microdesc.c
+++ b/src/test/test_microdesc.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011, The Tor Project, Inc. */
+/* Copyright (c) 2010-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index fde64ab28e810dd01c98e8f60f18c357d785e638..d3dadb9bfae695d3ec879bfeb99e5f2fe3114308 100644
--- a/src/test/test_pt.c
+++ b/src/test/test_pt.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 0d132ee8c83dbce1546f8bac6d63f4702e5bc9ec..bf33344039b30a0e22370ed7226c8e19e8663506 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2011, The Tor Project, Inc. */
+ * Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c
index 21de48d01f73d58b39fcb588d135dcfe3d3d69ed..10d13d837115942ac3a747f53306879ac5ac0965 100644
--- a/src/tools/tor-checkkey.c
+++ b/src/tools/tor-checkkey.c
@@ -1,3 +1,5 @@
+/* Copyright (c) 2008-2012, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
 
 #define CRYPTO_PRIVATE
 
diff --git a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
index eb739db7fc5b9f386c04a9802c3a2746a521e94f..0e0b385f9bc56a49341ccb010cb33c2e7e96480e 100644
--- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
+++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2010, Jacob Appelbaum, Steven J. Murdoch.
- * Copyright (c) 2010-2011, The Tor Project, Inc. */
+ * Copyright (c) 2010-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.h b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.h
index 0190379a23636f7b8477f03adc7fdcb2d933281a..54f541bcf457052105f76bd989b36542d0be2cb1 100644
--- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.h
+++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2010, Jacob Appelbaum, Steven J. Murdoch.
- * Copyright (c) 2010-2011, The Tor Project, Inc. */
+ * Copyright (c) 2010-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/tools/tor-fw-helper/tor-fw-helper-upnp.c b/src/tools/tor-fw-helper/tor-fw-helper-upnp.c
index ee56f716286860e4df07fb8439ded5cf9a2b598f..7c104f11cde9edf2a22ac97be7b7905259f32199 100644
--- a/src/tools/tor-fw-helper/tor-fw-helper-upnp.c
+++ b/src/tools/tor-fw-helper/tor-fw-helper-upnp.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2010, Jacob Appelbaum, Steven J. Murdoch.
- * Copyright (c) 2010-2011, The Tor Project, Inc. */
+ * Copyright (c) 2010-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/tools/tor-fw-helper/tor-fw-helper-upnp.h b/src/tools/tor-fw-helper/tor-fw-helper-upnp.h
index 021a8e0aacc84c92251de1509fcfca25b4815196..f037c75bab90f488233db91f57f954886e223041 100644
--- a/src/tools/tor-fw-helper/tor-fw-helper-upnp.h
+++ b/src/tools/tor-fw-helper/tor-fw-helper-upnp.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2010, Jacob Appelbaum, Steven J. Murdoch.
- * Copyright (c) 2010-2011, The Tor Project, Inc. */
+ * Copyright (c) 2010-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/tools/tor-fw-helper/tor-fw-helper.c b/src/tools/tor-fw-helper/tor-fw-helper.c
index ea5ae7ffadc2ab71fd84c3d80a82dfaee73d4c37..0510e65d117f6ab8df1072b1001c75052a74e814 100644
--- a/src/tools/tor-fw-helper/tor-fw-helper.c
+++ b/src/tools/tor-fw-helper/tor-fw-helper.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2010, Jacob Appelbaum, Steven J. Murdoch.
- * Copyright (c) 2010-2011, The Tor Project, Inc. */
+ * Copyright (c) 2010-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/tools/tor-fw-helper/tor-fw-helper.h b/src/tools/tor-fw-helper/tor-fw-helper.h
index 39d852d212a9ae8521155c6748fa4f33b37e6473..058afc4e0903163b0c3eca95c3bf9190ee009e03 100644
--- a/src/tools/tor-fw-helper/tor-fw-helper.h
+++ b/src/tools/tor-fw-helper/tor-fw-helper.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2010, Jacob Appelbaum, Steven J. Murdoch.
- * Copyright (c) 2010-2011, The Tor Project, Inc. */
+ * Copyright (c) 2010-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index 2d92e1ee8b5e9cb065e1409845b3826c5b8eb560..a8ffc077963e410b85fea00c09184fb4d5e28951 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2011, The Tor Project, Inc. */
+/* Copyright (c) 2007-2012, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 73352feac732eecf835f961ece37bbe920262c2c..4ef84f491cffe5f2b11e65d323e59671a6e62cfb 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
- * Copyright (c) 2007-2011, The Tor Project, Inc.
+ * Copyright (c) 2007-2012, The Tor Project, Inc.
  */
 /* See LICENSE for licensing information */