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 /Makefile.am | |
| parent | 1c25077b1ced61ef9b4179d9718959e678794900 (diff) | |
| parent | c3e63483b2f16eb1717035eac4c14315b95671f5 (diff) | |
| download | tor-b006e3279f72b5d1e966107a08d9b5c916915131.tar tor-b006e3279f72b5d1e966107a08d9b5c916915131.tar.gz | |
Merge remote branch 'origin/maint-0.2.1'
Conflicts:
src/common/test.h
src/or/test.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index b7dc6c8a5..af3746e77 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # 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 AUTOMAKE_OPTIONS = foreign |