Merge remote-tracking branch 'dgoulet/bug19567_029_01'

author Nick Mathewson <nickm@torproject.org>

Tue, 5 Jul 2016 16:14:04 +0000 (12:14 -0400)

committer Nick Mathewson <nickm@torproject.org>

Tue, 5 Jul 2016 16:14:04 +0000 (12:14 -0400)
author Nick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:14:04 +0000 (12:14 -0400)
committer Nick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:14:04 +0000 (12:14 -0400)
diff --cc src/or/shared_random.h
Simple merge
diff --cc src/test/test_shared_random.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Tue, 5 Jul 2016 16:14:04 +0000 (12:14 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Tue, 5 Jul 2016 16:14:04 +0000 (12:14 -0400)
		1	2
src/or/shared_random.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/test_shared_random.c	patch \|	diff1 \|	diff2 \|	blob \| history