Merge remote-tracking branch 'origin/patches-2.0'

author Nick Mathewson <nickm@torproject.org>

Wed, 1 Jun 2011 17:52:27 +0000 (13:52 -0400)

committer Nick Mathewson <nickm@torproject.org>

Wed, 1 Jun 2011 17:52:27 +0000 (13:52 -0400)
author Nick Mathewson <nickm@torproject.org>
Wed, 1 Jun 2011 17:52:27 +0000 (13:52 -0400)
committer Nick Mathewson <nickm@torproject.org>
Wed, 1 Jun 2011 17:52:27 +0000 (13:52 -0400)
diff --cc Makefile.am
Simple merge
diff --cc configure.in
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Wed, 1 Jun 2011 17:52:27 +0000 (13:52 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Wed, 1 Jun 2011 17:52:27 +0000 (13:52 -0400)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history