aboutsummaryrefslogtreecommitdiff
path: root/src/lib/err
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-09-10 08:43:13 +1000
committerteor <teor@torproject.org>2019-09-10 08:43:13 +1000
commit7e22d9934658c27ba0d45455959f46207a190649 (patch)
tree09c77a57b6413205faba03854b2fec03ec612671 /src/lib/err
parent4596ead2fc88e4b1482b0f3bc8ff356daea2337b (diff)
parent2e2a35b6943810257b6917648db90ed5d46505e1 (diff)
downloadtor-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/err')
-rw-r--r--src/lib/err/torerr_sys.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/err/torerr_sys.c b/src/lib/err/torerr_sys.c
index 3ab1b3c4e1..34f70f1f0b 100644
--- a/src/lib/err/torerr_sys.c
+++ b/src/lib/err/torerr_sys.c
@@ -33,7 +33,10 @@ subsys_torerr_shutdown(void)
const subsys_fns_t sys_torerr = {
.name = "err",
- .level = -100,
+ /* Low-level error handling is a diagnostic feature, we want it to init
+ * right after windows process security, and shutdown last.
+ * (Security never shuts down.) */
+ .level = -99,
.supported = true,
.initialize = subsys_torerr_initialize,
.shutdown = subsys_torerr_shutdown