diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-02-27 17:16:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-02-27 17:16:31 -0500 |
| commit | b006e3279f72b5d1e966107a08d9b5c916915131 (patch) | |
| tree | d8e1045df0e5825ce9eabf590c35303dd218c301 /src/common/aes.c | |
| parent | 1c25077b1ced61ef9b4179d9718959e678794900 (diff) | |
| parent | c3e63483b2f16eb1717035eac4c14315b95671f5 (diff) | |
| download | tor-b006e3279f72b5d1e966107a08d9b5c916915131.tar.gz tor-b006e3279f72b5d1e966107a08d9b5c916915131.zip | |
Merge remote branch 'origin/maint-0.2.1'
Conflicts:
src/common/test.h
src/or/test.c
Diffstat (limited to 'src/common/aes.c')
| -rw-r--r-- | src/common/aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index eb7f8fe3fc..2b6f0234b7 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-2009, The Tor Project, Inc. */ + * Copyright (c) 2007-2010, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** |