From 262d97deb4e1b4add9285f91cc1b62a4c5abe058 Mon Sep 17 00:00:00 2001 From: George Kadianakis Date: Mon, 2 Sep 2019 11:46:22 +0300 Subject: [PATCH 1/2] Fix #30649 changelog entry. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 439c435a73..637a1dfcd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,7 +95,7 @@ Changes in version 0.4.1.4-rc - 2019-07-25 o Minor bugfixes (circuit padding): - On relays, properly check that a padding machine is absent before logging a warning about it being absent. Fixes bug 30649; bugfix - on 0.4.1.1-alpha. + on 0.4.0.1-alpha. - Add two NULL checks in unreachable places to silence Coverity (CID 144729 and 1447291) and better future-proof ourselves. Fixes bug 31024; bugfix on 0.4.1.1-alpha. From 232202cc43c97c60c244fdbec729d2600928a7be Mon Sep 17 00:00:00 2001 From: George Kadianakis Date: Tue, 3 Sep 2019 17:07:50 +0300 Subject: [PATCH 2/2] Add #30649 to ReleaseNotes. --- ReleaseNotes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ReleaseNotes b/ReleaseNotes index aa88c5321e..60fcdd4506 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -83,6 +83,9 @@ Changes in version 0.4.1.5 - 2019-08-20 of bug 29875; bugfix on 0.3.0.1-alpha. o Major bugfixes (circuit build, guard): + - On relays, properly check that a padding machine is absent before + logging a warning about it being absent. Fixes bug 30649; bugfix + on 0.4.0.1-alpha. - When considering upgrading circuits from "waiting for guard" to "open", always ignore circuits that are marked for close. Otherwise, we can end up in the situation where a subsystem is notified that