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

author Nick Mathewson <nickm@torproject.org>

Sat, 23 Apr 2011 06:31:59 +0000 (02:31 -0400)

committer Nick Mathewson <nickm@torproject.org>

Sat, 23 Apr 2011 06:31:59 +0000 (02:31 -0400)
author Nick Mathewson <nickm@torproject.org>
Sat, 23 Apr 2011 06:31:59 +0000 (02:31 -0400)
committer Nick Mathewson <nickm@torproject.org>
Sat, 23 Apr 2011 06:31:59 +0000 (02:31 -0400)
diff --cc WIN32-Code/event2/event-config.h
Simple merge
diff --cc bufferevent_async.c
Simple merge
diff --cc configure.in
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Sat, 23 Apr 2011 06:31:59 +0000 (02:31 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Sat, 23 Apr 2011 06:31:59 +0000 (02:31 -0400)
		1	2
WIN32-Code/event2/event-config.h	patch \|	diff1 \|	diff2 \|	blob \| history
bufferevent_async.c	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history