merge new items into 0.2.6.3-alpha changelog

4 files changed, 17 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 62502ecef5..9e3b75808d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -147,6 +147,23 @@ Changes in version 0.2.6.3-alpha - 2015-02-??
     - Elevate authorized-client message from DEBUG to INFO. Closes
       ticket 14015.
 
+  o Minor bugfixes (path counting):
+    - When deciding whether we have any exit nodes, count the number listed
+      in the consensus, not the number we have descriptors for. Fixes part
+      of bug 14918; bugfix on 0.2.6.2-alpha.
+    - Do not warn that we are missing directory information if we have
+      decided not to fetch directory information due to a long period
+      of idleness. Fixes part of bug 14918; bugfix on 0.2.6.2-alpha.
+    - When deciding whether we have any exit nodes, only do processing for
+      ExitNodes when the ExitNodes option is actually set. Fixes part of
+      bug 14918; bugfix on 0.2.6.2-alpha.
+
+  o Minor features (relay):
+    - Use separate minimum bandwidth values for the configurations of
+      relays and bridges. Raise the minimum configured bandwidth for
+      bridges to 50 KiB/sec and for relays to 75 KiB/sec. (The old
+      values were 20 KiB/sec.) Closes ticket 13822.
+
   o Minor features (stability):
     - Prevent bugs from causing infinite loops in our hash-table
       iteration code by adding assertions that cached hash values have
diff --git a/changes/bug14918 b/changes/bug14918
deleted file mode 100644
index 6edd425820..0000000000
--- a/changes/bug14918
+++ /dev/null
@@ -1,15 +0,0 @@
-  o Minor bugfixes (path counting):
-    - When deciding whether we have any exit nodes, count the number listed
-      in the consensus, not the number we have descriptors for. Fixes part
-      of bug 14918; bugfix on 0.2.6.2-alpha.
-    - Do not warn that we are missing directory information if we have
-      decided not to fetch directory information due to a long period
-      of idleness. Fixes part of bug 14918; bugfix on 0.2.6.2-alpha.
-    - When deciding whether we have any exit nodes, only do processing for
-      ExitNodes when the ExitNodes option is actually set. Fixes part of
-      bug 14918; bugfix on 0.2.6.2-alpha.
-
-  o Minor bugfixes (logging during bootstrap):
-    - Correctly update and log the amount of directory information that
-      has been fetched during the bootstrap process. Fixes part of bug
-      14918; bugfix on 0.2.6.2-alpha.
diff --git a/changes/bug9321 b/changes/bug9321
deleted file mode 100644
index 98260844b1..0000000000
--- a/changes/bug9321
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major features:
-    - Introduce the Guardfraction feature which improves the load
-      balancing of path selection towards guard nodes. Specifically,
-      it aims to reduce the traffic gap that guard nodes experience
-      when they first get the Guard flag. This is a required step if
-      we want to increase the guard lifetime to 9 months or greater.
-      Resolves ticket 9321.
diff --git a/changes/feature13822 b/changes/feature13822
deleted file mode 100644
index 86ed0b8577..0000000000
--- a/changes/feature13822
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features:
-    - Use separate minimum bandwidth values for the configurations of
-      relays and bridges. Raise the minimum configured bandwidth for
-      bridges to 50 KiB/sec and for relays to 75 KiB/sec. (The old
-      values were 20 KiB/sec.) Closes ticket 13822.