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

author Nick Mathewson <nickm@torproject.org>

Thu, 3 Nov 2011 03:14:24 +0000 (23:14 -0400)

committer Nick Mathewson <nickm@torproject.org>

Thu, 3 Nov 2011 03:14:24 +0000 (23:14 -0400)
author Nick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2011 03:14:24 +0000 (23:14 -0400)
committer Nick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2011 03:14:24 +0000 (23:14 -0400)
diff --cc buffer.c
Simple merge
diff --cc test/regress_buffer.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Thu, 3 Nov 2011 03:14:24 +0000 (23:14 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Thu, 3 Nov 2011 03:14:24 +0000 (23:14 -0400)
		1	2
buffer.c	patch \|	diff1 \|	diff2 \|	blob \| history
test/regress_buffer.c	patch \|	diff1 \|	diff2 \|	blob \| history