June 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.3] Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 0575a182a633429e755dc4366eced76656461d9b Merge: 216456299 2a1f8ea2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:48:25 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 changes/bug33095_041 | 5 +++++ src/lib/log/util_bug.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 31bdfd4920849a38c7bd2ed2d8ef1b8645c65790 Merge: f862971d0 0575a182a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/maint-0.4.2] Do not set "once" when calling tor_bug_occurred_ from BUG().
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 2a1f8ea2e78486966c71762ebc3286f2b3e531ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 09:43:34 2020 -0500 Do not set "once" when calling tor_bug_occurred_ from BUG(). The "once" flag makes tor_bug_occurred_() say that future instances of the warning will be suppressed -- but that's not something that BUG() does. Fixes bug 33095; bugfix on 0.4.1.1-alpha. --- changes/bug33095_041 | 5 +++++ src/lib/log/util_bug.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug33095_041 b/changes/bug33095_041 new file mode 100644 index 000000000..7d1f04e27 --- /dev/null +++ b/changes/bug33095_041 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging, bug reporting): + - When logging a bug, do not say "Future instances of this warning + will be silenced" unless we are actually going to do + so. Previously we would say this whenever a BUG() check failed in + the code. Fixes bug 33095; bugfix on 0.4.1.1-alpha. diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index 546ae1e3e..f67c1e995 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -196,7 +196,7 @@ STMT_END #define BUG(cond) \ (ASSERT_PREDICT_UNLIKELY_(cond) ? \ - (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",1,NULL),1) \ + (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,"!("#cond")",0,NULL),1) \ : 0) #endif /* defined(ALL_BUGS_ARE_FATAL) || ... */

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 31bdfd4920849a38c7bd2ed2d8ef1b8645c65790 Merge: f862971d0 0575a182a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 9e85515f8335428242f0f1751de1e03077fb0133 Merge: 6fb31bb34 31bdfd492 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 9e85515f8335428242f0f1751de1e03077fb0133 Merge: 6fb31bb34 31bdfd492 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 0575a182a633429e755dc4366eced76656461d9b Merge: 216456299 2a1f8ea2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:48:25 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 changes/bug33095_041 | 5 +++++ src/lib/log/util_bug.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit def7844c4f636c51bed5d79f922a974521f68553 Merge: 6b71cc64c 9e85515f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.4'

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 31bdfd4920849a38c7bd2ed2d8ef1b8645c65790 Merge: f862971d0 0575a182a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 0575a182a633429e755dc4366eced76656461d9b Merge: 216456299 2a1f8ea2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:48:25 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 changes/bug33095_041 | 5 +++++ src/lib/log/util_bug.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0