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

author Nick Mathewson <nickm@torproject.org>

Mon, 10 Jun 2013 14:47:28 +0000 (10:47 -0400)

committer Nick Mathewson <nickm@torproject.org>

Mon, 10 Jun 2013 14:47:28 +0000 (10:47 -0400)
author Nick Mathewson <nickm@torproject.org>
Mon, 10 Jun 2013 14:47:28 +0000 (10:47 -0400)
committer Nick Mathewson <nickm@torproject.org>
Mon, 10 Jun 2013 14:47:28 +0000 (10:47 -0400)
diff --cc arc4random.c
Simple merge
diff --cc include/event2/util.h
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Mon, 10 Jun 2013 14:47:28 +0000 (10:47 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Mon, 10 Jun 2013 14:47:28 +0000 (10:47 -0400)
		1	2
arc4random.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/event2/util.h	patch \|	diff1 \|	diff2 \|	blob \| history