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

author Nick Mathewson <nickm@torproject.org>

Fri, 20 Apr 2012 15:51:33 +0000 (11:51 -0400)

committer Nick Mathewson <nickm@torproject.org>

Fri, 20 Apr 2012 15:51:33 +0000 (11:51 -0400)
author Nick Mathewson <nickm@torproject.org>
Fri, 20 Apr 2012 15:51:33 +0000 (11:51 -0400)
committer Nick Mathewson <nickm@torproject.org>
Fri, 20 Apr 2012 15:51:33 +0000 (11:51 -0400)
diff --cc event.c
Simple merge
diff --cc test/regress.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Fri, 20 Apr 2012 15:51:33 +0000 (11:51 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 20 Apr 2012 15:51:33 +0000 (11:51 -0400)
		1	2
event.c	patch \|	diff1 \|	diff2 \|	blob \| history
test/regress.c	patch \|	diff1 \|	diff2 \|	blob \| history