From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 16:51:17 +0000 (-0500)
Subject: Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.2.21-alpha~7^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1de329e784e76dbb27cde148522a6c490e7cf63;p=thirdparty%2Ftor.git

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
	src/common/test.h
	src/or/test.c
---

f1de329e784e76dbb27cde148522a6c490e7cf63
diff --cc Makefile.am
index d03c71ff2c,4ded744fde..eb61de7ff0
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,6 -1,7 +1,6 @@@
 -# $Id$
  # 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
  
  AUTOMAKE_OPTIONS = foreign