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/or/config.c | |
| parent | da9190013510412cec00e38c064c5c718d032f9e (diff) | |
| parent | 30b3475e6d5f5b644d4b607b343ff1da9540d178 (diff) | |
| download | tor-8730884ebe8f30c69e361865ce25ad5c7b59805f.tar.gz tor-8730884ebe8f30c69e361865ce25ad5c7b59805f.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index 8a185cf7d6..9ea94838cb 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-2010, The Tor Project, Inc. */ + * Copyright (c) 2007-2011, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@ -2333,7 +2333,7 @@ print_usage(void) printf( "Copyright (c) 2001-2004, Roger Dingledine\n" "Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson\n" -"Copyright (c) 2007-2010, The Tor Project, Inc.\n\n" +"Copyright (c) 2007-2011, The Tor Project, Inc.\n\n" "tor -f <torrc> [args]\n" "See man page for options, or https://www.torproject.org/ for " "documentation.\n"); |