diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:51:17 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:51:17 -0500 |
| commit | f1de329e784e76dbb27cde148522a6c490e7cf63 (patch) | |
| tree | 3d3fea0781bfa37410a932e7d7345af25f845ea9 /src/tools | |
| parent | e895919b171029df4d38285b0be4483376b4ad25 (diff) | |
| parent | 1a07348a50ec679c8b7bb1abb45e61a9ebcc69a9 (diff) | |
| download | tor-f1de329e784e76dbb27cde148522a6c490e7cf63.tar tor-f1de329e784e76dbb27cde148522a6c490e7cf63.tar.gz | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/common/test.h
src/or/test.c
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tor-gencert.c | 2 | ||||
| -rw-r--r-- | src/tools/tor-resolve.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index bc99c24bd..a04eddafc 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2010 The Tor Project, Inc. */ +/* Copyright (c) 2007-2011, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #include "orconfig.h" diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index f5b0becaf..12349d9d1 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -1,5 +1,5 @@ /* 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 */ |