Merge pull request #6194 from keszybz/urandom-magic

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Fri, 30 Jun 2017 17:05:56 +0000 (13:05 -0400)

committer GitHub <noreply@github.com>

Fri, 30 Jun 2017 17:05:56 +0000 (13:05 -0400)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 30 Jun 2017 17:05:56 +0000 (13:05 -0400)
committer GitHub <noreply@github.com>
Fri, 30 Jun 2017 17:05:56 +0000 (13:05 -0400)
diff --cc .gitignore
Simple merge
diff --cc Makefile.am
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Fri, 30 Jun 2017 17:05:56 +0000 (13:05 -0400)
committer	GitHub <noreply@github.com>
	Fri, 30 Jun 2017 17:05:56 +0000 (13:05 -0400)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history