Porting combined errors from mbedtls changes #384

Job	Run time
Cargo bench	6m 32s
Rustfmt	8s
Test (stable, x86_64-unknown-linux-gnu, ubuntu-20.04)	2m 33s
Test (stable, x86_64-fortanix-unknown-sgx, ubuntu-20.04)	1m 2s
Test (stable, x86_64-pc-windows-msvc, windows-latest)	2m 36s
Test (stable, x86_64-pc-windows-msvc, windows-2019)	2m 36s
Test (stable, aarch64-unknown-linux-musl, ubuntu-20.04)	2m 43s
Test (beta, x86_64-unknown-linux-gnu, ubuntu-20.04)	2m 40s
Test (nightly, x86_64-unknown-linux-gnu, ubuntu-20.04)	2m 27s
Test (stable, x86_64-apple-darwin, macos-latest)	2m 44s
ci	1s
	26m 2s

Provide feedback