Porting combined errors from mbedtls changes #386

Job	Run time
Rustfmt	14s
Cargo bench	6m 20s
Test (stable, x86_64-unknown-linux-gnu, ubuntu-20.04)	4m 54s
Test (stable, x86_64-fortanix-unknown-sgx, ubuntu-20.04)	36s
Test (stable, x86_64-pc-windows-msvc, windows-latest)	17m 10s
Test (stable, x86_64-pc-windows-msvc, windows-2019)	16m 40s
Test (stable, aarch64-unknown-linux-musl, ubuntu-20.04)	7m 56s
Test (beta, x86_64-unknown-linux-gnu, ubuntu-20.04)	7m 29s
Test (nightly, x86_64-unknown-linux-gnu, ubuntu-20.04)	7m 1s
Test (stable, x86_64-apple-darwin, macos-latest)	3m 27s
ci	1s
	1h 11m 48s

Provide feedback