summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-22 10:20:15 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-22 10:20:15 -0400
commit2b2634339b439e7919d1f58da9befbf16fae650f (patch)
tree224f720877669663bea899a731e2f5437c85212f
parentc91c4e9bb69113feee91f0056ca9aea7adc538fd (diff)
downloadtor-2b2634339b439e7919d1f58da9befbf16fae650f.tar.gz
tor-2b2634339b439e7919d1f58da9befbf16fae650f.zip
Move bug25145 entry into ChangeLog
(It doesn't go into ReleaseNotes, since it's a bugfix on 0.3.3.2-alpha)
-rw-r--r--ChangeLog5
-rw-r--r--changes/bug254154
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5473a3288b..d31dbbf02f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,11 @@ Changes in version 0.3.3.6 - 2018-05-??
uninitialised buffer. They now log a warning about the empty file
instead. Fixes bug 26007; bugfix on 0.2.2.1-alpha.
+ o Major bugfixes (directory authorities, backport from 0.3.4.1-alpha):
+ - Avoid a crash when testing router reachability on a router that
+ could have an ed25519 ID, but which does not. Fixes bug 25415;
+ bugfix on 0.3.3.2-alpha.
+
o Major bugfixes (crash, backport from 0.3.4.1-alpha):
- Avoid a rare assertion failure in the circuit build timeout code
if we fail to allow any circuits to actually complete. Fixes bug
diff --git a/changes/bug25415 b/changes/bug25415
deleted file mode 100644
index ec851aee8d..0000000000
--- a/changes/bug25415
+++ /dev/null
@@ -1,4 +0,0 @@
- o Major bugfixes (directory authority):
- - Avoid a crash when testing router reachability on a router that could
- have an ed25519 ID, but which does not. Fixes bug 25415; bugfix on
- 0.3.3.2-alpha.