Merge remote-tracking branch 'github/20_global_locks_init' into patches-2.0

author Nick Mathewson <nickm@torproject.org>

Mon, 4 Jul 2011 16:16:08 +0000 (12:16 -0400)

committer Nick Mathewson <nickm@torproject.org>

Mon, 4 Jul 2011 16:16:08 +0000 (12:16 -0400)
author Nick Mathewson <nickm@torproject.org>
Mon, 4 Jul 2011 16:16:08 +0000 (12:16 -0400)
committer Nick Mathewson <nickm@torproject.org>
Mon, 4 Jul 2011 16:16:08 +0000 (12:16 -0400)
diff --cc event-internal.h
Simple merge
diff --cc event.c
Simple merge
diff --cc evthread.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Mon, 4 Jul 2011 16:16:08 +0000 (12:16 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Mon, 4 Jul 2011 16:16:08 +0000 (12:16 -0400)
		1	2
event-internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
event.c	patch \|	diff1 \|	diff2 \|	blob \| history
evthread.c	patch \|	diff1 \|	diff2 \|	blob \| history