Upgrade openssl and openssl-sys

[ishitatsuyuki]

Fix #57169

[rust-highfive]

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

[ishitatsuyuki]

r? @kennytm

[ishitatsuyuki]

ping @kennytm

[kennytm]

@bors r+

[bors]

📌 Commit f56a9610b2d948558bd7a0af3286b3d8b311a7bc has been approved by kennytm

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout bump-openssl (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self bump-openssl --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[ishitatsuyuki]

r? @kennytm

[sfackler]

@bors r+

[bors]

📌 Commit 9740c5e has been approved by sfackler

[bors]

⌛ Testing commit 9740c5e with merge 2d7c8e9...

[bors]

☀️ Test successful - status-appveyor, status-travis
Approved by: sfackler
Pushing 2d7c8e9 to master...