[tor-commits] [tor/release-0.2.4] fold in more changes entries

[arma at torproject.org]

commit a2ea9df49895f45fd9fcc6a4526769be935bf330
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Aug 5 12:06:09 2013 -0400

    fold in more changes entries
---
 ChangeLog       |   15 ++++++++++++++-
 changes/bug9288 |    4 ----
 changes/bug9309 |    6 ------
 changes/bug9337 |    4 ----
 changes/bug9354 |    5 -----
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 79d1043..e741732 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,25 @@
-Changes in version 0.2.4.16-rc - 2013-07-2?
+Changes in version 0.2.4.16-rc - 2013-08-0?
   o Major bugfixes:
     - Fix a bug in the voting algorithm that could yield incorrect results
       when a non-naming authority declared too many flags. Fixes bug 9200;
       bugfix on 0.2.0.3-alpha.
+    - Avoid an assertion failure when processing DNS replies without the
+      answer types we expected. Fixes bug 9337; bugfix on 0.2.4.7-alpha.
     - Avoid a crash when using --hash-password. Fixes bug 9295; bugfix on
       0.2.4.15-rc. Found by stem integration tests.
 
   o Minor bugfixes:
+    - Fix an invalid memory read that occured when a pluggable
+      transport proxy failed its configuration protocol.
+      Fixes bug 9288; bugfix on 0.2.4.1-alpha.
+    - When evaluating whether to use a connection that we haven't
+      decided is canonical using a recent link protocol version,
+      decide that it's canonical only if it used address _does_
+      match the desired address. Fixes bug 9309; bugfix on
+      0.2.4.4-alpha. Reported by skruffy.
+    - Make the default behavior of NumDirectoryGuards be to track
+      NumEntryGuards. Now a user who changes only NumEntryGuards will get
+      the behavior she expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha.
     - Fix a spurious compilation warning with some older versions of
       GCC on FreeBSD. Fixes bug 9254; bugfix on 0.2.4.14-alpha.
 
diff --git a/changes/bug9288 b/changes/bug9288
deleted file mode 100644
index 59bf414..0000000
--- a/changes/bug9288
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix an invalid memory read that occured when a pluggable
-      transport proxy failed its configuration protocol.
-      Fixes bug 9288.
diff --git a/changes/bug9309 b/changes/bug9309
deleted file mode 100644
index 38c462b..0000000
--- a/changes/bug9309
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - When evaluating whether to use a connection that we haven't
-      decided is canonical using a recent link protocol version,
-      decide that it's canonical only if it used address _does_
-      match the desired address. Fixes bug 9309; bugfix on
-      0.2.4.4-alpha. Reported by skruffy.
diff --git a/changes/bug9337 b/changes/bug9337
deleted file mode 100644
index ce99bc8..0000000
--- a/changes/bug9337
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes (DNS):
-    - Avoid an assertion failure when processing DNS replies without the
-      answer types we expected. Fixes bug 9337; bugfix on 0.2.4.7-alpha.
-
diff --git a/changes/bug9354 b/changes/bug9354
deleted file mode 100644
index 68fc81a..0000000
--- a/changes/bug9354
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Make the default behavior of NumDirectoryGuards be to track
-      NumEntryGuards. Now a user who changes only NumEntryGuards will get
-      the behavior she expects. Fixes bug 9354; bugfix on 0.2.4.8-alpha.
-