Merged modified lines from bug31615_041, and unmodified lines
from master.

Part of 31615.

Merged modified lines from bug31615_040, and unmodified lines
from maint-0.4.1.

These levels get out of date really easily: we'll implement a level
dump command in tor in 31614.

They also cause conflicts and inconsistencies when merging forward
level changes.

Part of 31615.

David Goulet authored Aug 20, 2019 and Nick Mathewson committed Sep 09, 2019

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

David Goulet authored Aug 20, 2019 and Nick Mathewson committed Sep 09, 2019

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 Aug 20, 2019 and Nick Mathewson committed Sep 09, 2019

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

Fix levels for subsystems that depend on log/err
* winprocess (security) doesn't use err:
  * call windows process security APIs as early as possible
  * init err after winprocess
  * move wallclock so it's still after err
* network and time depend on log:
  * make sure that network and time can use logging.
  * init network and time after log

Add comments explaining the module init order.

Fixes bug 31615; bugfix on 0.4.0.1-alpha.

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.