diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-07-02 10:20:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-07-02 10:20:20 -0400 |
| commit | 078c34e28e02bcb3a9fd28f3fee3c5e956ec8e1f (patch) | |
| tree | d46527ead8a0ec1fe1bfa7ae886adc209afcaf4d /Makefile.am | |
| parent | 9f28cfe86af085e94b9b929041851dc8386231b2 (diff) | |
| parent | 4e8d22846b4eed41525fb9e5f755b56515f0dd5a (diff) | |
| download | tor-078c34e28e02bcb3a9fd28f3fee3c5e956ec8e1f.tar.gz tor-078c34e28e02bcb3a9fd28f3fee3c5e956ec8e1f.zip | |
Merge commit 'origin/maint-0.2.1'
[Didn't take Karsten's full bug 1024 workaround, since 0.2.2 doesn't
use v0 rend descs.]
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 d4ebbb1fda..55a01e421c 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-2008, The Tor Project, Inc. +# Copyright (c) 2007-2009, The Tor Project, Inc. # See LICENSE for licensing information AUTOMAKE_OPTIONS = foreign |