Merge pull request #2311 from felixhandte/ddss-fix-cparam-derivation

author Felix Handte <w@felixhandte.com>

Fri, 18 Sep 2020 18:02:14 +0000 (14:02 -0400)

committer GitHub <noreply@github.com>

Fri, 18 Sep 2020 18:02:14 +0000 (14:02 -0400)
author Felix Handte <w@felixhandte.com>
Fri, 18 Sep 2020 18:02:14 +0000 (14:02 -0400)
committer GitHub <noreply@github.com>
Fri, 18 Sep 2020 18:02:14 +0000 (14:02 -0400)
diff --cc lib/compress/zstd_compress.c
Simple merge
diff --cc lib/zstd.h
Simple merge
author	Felix Handte <w@felixhandte.com>
	Fri, 18 Sep 2020 18:02:14 +0000 (14:02 -0400)
committer	GitHub <noreply@github.com>
	Fri, 18 Sep 2020 18:02:14 +0000 (14:02 -0400)
		1	2
lib/compress/zstd_compress.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/zstd.h	patch \|	diff1 \|	diff2 \|	blob \| history