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

author Nick Mathewson <nickm@torproject.org>

Mon, 14 Nov 2011 23:22:08 +0000 (18:22 -0500)

committer Nick Mathewson <nickm@torproject.org>

Mon, 14 Nov 2011 23:22:08 +0000 (18:22 -0500)
author Nick Mathewson <nickm@torproject.org>
Mon, 14 Nov 2011 23:22:08 +0000 (18:22 -0500)
committer Nick Mathewson <nickm@torproject.org>
Mon, 14 Nov 2011 23:22:08 +0000 (18:22 -0500)
diff --cc event.c
Simple merge
diff --cc evthread-internal.h
Simple merge
diff --cc evthread.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Mon, 14 Nov 2011 23:22:08 +0000 (18:22 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Mon, 14 Nov 2011 23:22:08 +0000 (18:22 -0500)
		1	2
event.c	patch \|	diff1 \|	diff2 \|	blob \| history
evthread-internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
evthread.c	patch \|	diff1 \|	diff2 \|	blob \| history