diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:53:28 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:53:28 -0500 |
commit | 8730884ebe8f30c69e361865ce25ad5c7b59805f (patch) | |
tree | 3913b4c569d6979b3e25d32435b41671f828e6f2 /src/tools | |
parent | da9190013510412cec00e38c064c5c718d032f9e (diff) | |
parent | 30b3475e6d5f5b644d4b607b343ff1da9540d178 (diff) | |
download | tor-8730884ebe8f30c69e361865ce25ad5c7b59805f.tar tor-8730884ebe8f30c69e361865ce25ad5c7b59805f.tar.gz |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/tor-gencert.c | 2 | ||||
-rw-r--r-- | src/tools/tor-resolve.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index bc99c24bd..a04eddafc 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2010 The Tor Project, Inc. */ +/* Copyright (c) 2007-2011, 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 f5b0becaf..12349d9d1 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-2010, The Tor Project, Inc. + * Copyright (c) 2007-2011, The Tor Project, Inc. */ /* See LICENSE for licensing information */ |