diff options
| author | teor <teor@torproject.org> | 2019-09-05 11:57:19 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-09-05 11:57:19 +1000 |
| commit | 40797bd3612477204c3cd459cc39021c5de71078 (patch) | |
| tree | 3b977a535a03f7e8978012553a50cf1ba2f7174e | |
| parent | 51103450e4a997aa5a31cf9d60b3b22355525bd5 (diff) | |
| parent | 232202cc43c97c60c244fdbec729d2600928a7be (diff) | |
| download | tor-40797bd3612477204c3cd459cc39021c5de71078.tar.gz tor-40797bd3612477204c3cd459cc39021c5de71078.zip | |
Merge remote-tracking branch 'tor-github/pr/1282' into release-0.4.1
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | ReleaseNotes | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -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 |