Merge pull request #891 from facebook/contentSize

author Yann Collet <Cyan4973@users.noreply.github.com>

Wed, 18 Oct 2017 00:24:51 +0000 (17:24 -0700)

committer GitHub <noreply@github.com>

Wed, 18 Oct 2017 00:24:51 +0000 (17:24 -0700)
author Yann Collet <Cyan4973@users.noreply.github.com>
Wed, 18 Oct 2017 00:24:51 +0000 (17:24 -0700)
committer GitHub <noreply@github.com>
Wed, 18 Oct 2017 00:24:51 +0000 (17:24 -0700)
diff --cc lib/compress/zstd_compress.c
Simple merge
diff --cc tests/zstreamtest.c
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Wed, 18 Oct 2017 00:24:51 +0000 (17:24 -0700)
committer	GitHub <noreply@github.com>
	Wed, 18 Oct 2017 00:24:51 +0000 (17:24 -0700)
		1	2
lib/compress/zstd_compress.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/zstreamtest.c	patch \|	diff1 \|	diff2 \|	blob \| history