[or-cvs] [tor/release-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

[arma@xxxxxxxxxxxxxx]

commit 0e9d7f105d217e88b87058fabb31c94e4f72762c
Merge: f089804 e432068
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jan 3 17:24:32 2011 -0500

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

 Makefile.am     |    2 +-
 changes/bug2305 |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --combined Makefile.am
index eb61de7,bcb81e6..5f15926
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,16 -1,17 +1,16 @@@
 -# $Id$
  # Copyright (c) 2001-2004, Roger Dingledine
  # Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
  # Copyright (c) 2007-2011, The Tor Project, Inc.
  # See LICENSE for licensing information
  
- AUTOMAKE_OPTIONS = foreign
+ AUTOMAKE_OPTIONS = foreign 1.7
   # else it keeps trying to put COPYING back in
  
  SUBDIRS = src doc contrib
  
  DIST_SUBDIRS = src doc contrib
  
 -EXTRA_DIST = INSTALL README AUTHORS LICENSE ChangeLog          \
 +EXTRA_DIST = INSTALL README LICENSE ChangeLog          \
               ReleaseNotes tor.spec tor.spec.in
  
  #install-data-local:
@@@ -34,22 -35,39 +34,22 @@@ dist-rpm
  	mv $$RPM_BUILD_DIR/RPMS/* .;                            \
  	rm -rf $$RPM_BUILD_DIR
  
 -dist-osx:
 -	@if [ "x$(prefix)" != 'x/Library/Tor' ]; then \
 -	  echo "Configure with --prefix=/Library/Tor, please"; \
 -	  exit 1; \
 -	fi; \
 -	if [ "x$(bindir)" != 'x/Library/Tor' ]; then \
 -	  echo "Configure with --bindir=/Library/Tor, please"; \
 -	  exit 1; \
 -	fi; \
 -	if [ "x$(sysconfdir)" != 'x/Library' ]; then \
 -	  echo "Configure with --sysconfdir=/Library, please"; \
 -	  exit 1; \
 -	fi; \
 -	if [ "x$(CONFDIR)" != 'x/Library/Tor' ]; then \
 -	  echo "Configure with CONFDIR=/Library/Tor, please"; \
 -	fi
 -	$(MAKE) all
 -	VERSION=$(VERSION) sh ./contrib/osx/package.sh
 -
  dist: check
  
  doxygen:
  	doxygen && cd doc/doxygen/latex && make
  
 -test:
 -	./src/or/test
 +test: all
 +	./src/test/test
  
 -# Avoid strlcpy.c, strlcat.c, tree.h
 +# Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c,
 +# eventdns.[hc], tinytest*.[ch]
  check-spaces:
  	./contrib/checkSpace.pl -C                    \
  	        src/common/*.h                        \
  		src/common/[^asO]*.c src/common/address.c \
 -		src/or/[^et]*.[ch] src/or/t*.c src/or/eventdns_tor.h
 +		src/or/[^e]*.[ch] src/or/eventdns_tor.h \
 +		src/test/test*.[ch] src/tools/*.[ch]
  
  check-docs:
  	./contrib/checkOptionDocs.pl