merge new items into 0.2.6.3-alpha changelog

1 files changed, 17 insertions, 0 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