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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index e2c93d8101..1d09ead1f2 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-2010, The Tor Project, Inc. +# Copyright (c) 2007-2011, The Tor Project, Inc. # See LICENSE for licensing information # "foreign" means we don't follow GNU package layout standards |