Auto merge of #3657 - Keruspe:rust-1.16.0, r=alexcrichton

ensure libressl compatibility

like #3644 but for the rust-1.16.0 branch