Adding the ability to do TLS client authentication for DoH #1203
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks! Can you just resolve the little merge conflict, so we can merge it? |
|
Hey @jedisct1 - I resolved the merge conflict in commit 12d108ea83232b0654664f7d8676c7f5c2d3e217, 2nd commit in this PR. I can't see any other conflicts here? |
|
Weird, GitHub is telling me that merging is impossible due to conflicts? The "Rebase and merge" button if grayed out. |
|
Squash and merge, worked. Thanks! :) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following on from issue 1156, this PR adds the ability to use TLS client authentication for DoH services.