diff options
| author | George Kadianakis <desnacked@riseup.net> | 2019-04-15 13:56:48 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2019-04-15 13:56:48 +0300 |
| commit | 6b8d01693a5c1c993420bd013a2cc0b768095b35 (patch) | |
| tree | 46f6f3e92c72fa7a8f9b812b7b9604973ccfb82b | |
| parent | 5ae1389465f9be45530c8e07f7870e021705fe31 (diff) | |
| parent | 15591e1bbda17983fa2f8f099d48fcef2e675971 (diff) | |
| download | tor-6b8d01693a5c1c993420bd013a2cc0b768095b35.tar.gz tor-6b8d01693a5c1c993420bd013a2cc0b768095b35.zip | |
Merge branch 'maint-0.4.0' into release-0.4.0
| -rw-r--r-- | changes/bug27199 | 3 | ||||
| -rw-r--r-- | src/rust/Cargo.toml | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/changes/bug27199 b/changes/bug27199 new file mode 100644 index 0000000000..f9d2a422f9 --- /dev/null +++ b/changes/bug27199 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Abort on panic in all build profiles, instead of potentially unwinding + into C code. Fixes bug 27199; bugfix on 0.3.3.1-alpha. diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 83f9629660..de8693ea33 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -10,6 +10,17 @@ members = [ "tor_util", ] +# Can remove panic="abort" when this issue is fixed: +# https://github.com/rust-lang/rust/issues/52652 +[profile.dev] +panic = "abort" + [profile.release] debug = true panic = "abort" + +[profile.test] +panic = "abort" + +[profile.bench] +panic = "abort" |