Skip to content

Merge in complete history from BoringSSL up to 78b3337#1

Merged
andrewhop merged 6188 commits intoaws:masterfrom
andrewhop:boringmerge
May 22, 2020
Merged

Merge in complete history from BoringSSL up to 78b3337#1
andrewhop merged 6188 commits intoaws:masterfrom
andrewhop:boringmerge

Conversation

@andrewhop
Copy link
Copy Markdown
Contributor

@andrewhop andrewhop commented May 14, 2020 •
edited
Loading

Issue #, if available:
N/A

Description of changes:
This merges in the complete history up to 2020-05-14 78b3337a10a7f7b3495b6cb8140a74e265290898.

Ran the following:

git fetch git@github.com:google/boringssl.git 78b3337a10a7f7b3495b6cb8140a74e265290898
git merge --strategy recursive --strategy-option theirs --allow-unrelated-histories 78b3337a10a7f7b3495b6cb8140a74e265290898
git push --set-upstream origin boringmerge

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@andrew-kaufman andrew-kaufman andrew-kaufman approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.