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. 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