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

author Nick Mathewson <nickm@torproject.org>

Wed, 24 Aug 2011 20:17:56 +0000 (16:17 -0400)

committer Nick Mathewson <nickm@torproject.org>

Wed, 24 Aug 2011 20:17:56 +0000 (16:17 -0400)
author Nick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2011 20:17:56 +0000 (16:17 -0400)
committer Nick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2011 20:17:56 +0000 (16:17 -0400)
diff --cc bufferevent_ratelim.c
Simple merge
diff --cc event-internal.h
Simple merge
diff --cc event.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Wed, 24 Aug 2011 20:17:56 +0000 (16:17 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Wed, 24 Aug 2011 20:17:56 +0000 (16:17 -0400)
		1	2
bufferevent_ratelim.c	patch \|	diff1 \|	diff2 \|	blob \| history
event-internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
event.c	patch \|	diff1 \|	diff2 \|	blob \| history