Merge v3.9.2 back into master #308
Merged
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
This fixes an issue where URLs provided with --input are not accepted by the preventMistakes filter. The filter itself needs to execute _only_ on URLs returned by the checkIn API, rather than on URLs returned by the InputLoader, which may instead be user provided. Reference issue: ooni/probe#1435
When this happens, the user is expressing the intention of explicitly testing all the input they provided. So, disable maxRuntime in these cases. Part of ooni/probe#1436.
ooni/probe-cli v3.9.2
This was referenced Apr 7, 2021
ainghazal
pushed a commit
to ainghazal/probe-cli
that referenced
this pull request
Mar 8, 2022
Merge v3.9.2 back into master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This merge used
git merge -X ours v3.9.2. The purpose is to guarantee we don't loose anything from the stable branch into the main development branch. The diff should be empty.