aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-08-27 14:28:00 -0400
committerRoger Dingledine <arma@torproject.org>2012-08-27 14:28:00 -0400
commit0ccd57f0f247171d43e325d29bfcc102d877ca1c (patch)
tree15670f3736be7ffd84ce76203cf4042d41d24992
parent5898c09c3ab6c20df822ea919fecc9420a48aa7b (diff)
downloadtor-0ccd57f0f247171d43e325d29bfcc102d877ca1c.tar
tor-0ccd57f0f247171d43e325d29bfcc102d877ca1c.tar.gz
and fix them here too
-rw-r--r--ChangeLog5
-rw-r--r--ReleaseNotes5
-rw-r--r--changes/note-releasenote-fix10
3 files changed, 4 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a1ad7793..fa320a541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
Changes in version 0.2.2.38 - 2012-08-12
- Tor 0.2.2.38 fixes a rare race condition that can crash exit relays;
- fixes a remotely triggerable crash bug; and fixes a timing attack that
- could in theory leak path information.
+ Tor 0.2.2.38 fixes a remotely triggerable crash bug, and fixes a timing
+ attack that could in theory leak path information.
o Security fixes:
- Avoid an uninitialized memory read when reading a vote or consensus
diff --git a/ReleaseNotes b/ReleaseNotes
index 2782d3779..0d710d9c4 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -4,9 +4,8 @@ of Tor. If you want to see more detailed descriptions of the changes in
each development snapshot, see the ChangeLog file.
Changes in version 0.2.2.38 - 2012-08-12
- Tor 0.2.2.38 fixes a rare race condition that can crash exit relays;
- fixes a remotely triggerable crash bug; and fixes a timing attack that
- could in theory leak path information.
+ Tor 0.2.2.38 fixes a remotely triggerable crash bug, and fixes a timing
+ attack that could in theory leak path information.
o Security fixes:
- Avoid an uninitialized memory read when reading a vote or consensus
diff --git a/changes/note-releasenote-fix b/changes/note-releasenote-fix
deleted file mode 100644
index 586e2d263..000000000
--- a/changes/note-releasenote-fix
+++ /dev/null
@@ -1,10 +0,0 @@
-
- o Documentation fix:
- Remove the following entry from the 0.2.2.38 changelog, since the patch
- was not, in fact, included in 0.2.2.38:
- .
- - Avoid read-from-freed-memory and double-free bugs that could occur
- when a DNS request fails while launching it. Fixes bug 6480;
- bugfix on 0.2.0.1-alpha.
- .
- Fixes bug 6657; bugfix on 0.2.2.38.