summaryrefslogtreecommitdiff
path: root/src/lib/err
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-09-10 09:03:37 +1000
committerteor <teor@torproject.org>2019-09-10 09:03:37 +1000
commit987768b07766e752d7aa7234916abe1e8e2feb87 (patch)
tree4952b592b5cb39911eed33405b1433d249dc4c70 /src/lib/err
parent796a9b37ea346f413f6684505ca31879ddf3f0f1 (diff)
parentf1c57cd1e5d8ae88f28f764fef7f17081ebf2961 (diff)
downloadtor-987768b07766e752d7aa7234916abe1e8e2feb87.tar.gz
tor-987768b07766e752d7aa7234916abe1e8e2feb87.zip
Merge branch 'bug31615_041' into bug31615_master
Merged modified lines from bug31615_041, and unmodified lines from master.
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