Closes #31673

David Goulet authored 5 years ago and Nick Mathewson committed 5 years ago

Signed-off-by: David Goulet <dgoulet@torproject.org>

David Goulet authored 5 years ago and Nick Mathewson committed 5 years ago

Move it outside of the validation function since 0 is a valid value but
disables defenses.

Signed-off-by: David Goulet <dgoulet@torproject.org>

David Goulet authored 5 years ago and Nick Mathewson committed 5 years ago

Signed-off-by: David Goulet <dgoulet@torproject.org>

I've done this manually, since I don't want to override the existing
exceptions in this branch.

I was expecting our filter code to work in a way it didn't.  I
thought that saying that DependencyViolation applied to "*" would
hit all of the files -- but actually, "*" wasn't implemented.  I had
to say "*.c" and "*.h"

These turned out to be unnecessary, so let's not keep them around
and let them start getting complicated.

Closes ticket 31630.

Resolved modified/deleted conflict on changes/bug30649 by deleting
the file.

tor-github/pr/1282 modifies ChangeLog and ReleaseNotes instead of
changes/bug30649. We cherry-picked it to master, as well as merging
to release-0.4.1.

tor-github/pr/1283, with the following changes:
* cherry-pick the merge commit in 1283 on top of...
* tor-github/pr/1174, but with the last commit re-worded to remove
    the fixup, because fixups break our push rules.

This is an "ours" merge, except for the bugfix version change in
changes/bug30649.

tor-github/pr/1174, but with the last commit re-worded to remove
the fixup, because fixups break our push rules.

Part of 30967.