diff options
author | teor <teor@torproject.org> | 2019-09-10 08:43:13 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-09-10 08:43:13 +1000 |
commit | 7e22d9934658c27ba0d45455959f46207a190649 (patch) | |
tree | 09c77a57b6413205faba03854b2fec03ec612671 /src/lib/time | |
parent | 4596ead2fc88e4b1482b0f3bc8ff356daea2337b (diff) | |
parent | 2e2a35b6943810257b6917648db90ed5d46505e1 (diff) | |
download | tor-7e22d9934658c27ba0d45455959f46207a190649.tar.gz tor-7e22d9934658c27ba0d45455959f46207a190649.zip |
Merge branch 'bug31615_040' into bug31615_041
Merged modified lines from bug31615_040, and unmodified lines
from maint-0.4.1.
Diffstat (limited to 'src/lib/time')
-rw-r--r-- | src/lib/time/time_sys.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/time/time_sys.c b/src/lib/time/time_sys.c index b3feb7b46a..8b9aa2856c 100644 --- a/src/lib/time/time_sys.c +++ b/src/lib/time/time_sys.c @@ -20,7 +20,9 @@ subsys_time_initialize(void) const subsys_fns_t sys_time = { .name = "time", - .level = -90, + /* Monotonic time depends on logging, and a lot of other modules depend on + * monotonic time. */ + .level = -80, .supported = true, .initialize = subsys_time_initialize, }; |