[tor-commits] [tor/release-0.3.1] Fold two more entries into 0.3.1.6-rc changelog

[nickm@xxxxxxxxxxxxxx]

commit bebf7eb54e0852eeefa4b8608354ab75f912050b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Sep 5 08:29:54 2017 -0400

    Fold two more entries into 0.3.1.6-rc changelog
---
 ChangeLog               | 14 +++++++++++++-
 changes/bug22752_simple |  6 ------
 changes/bug23275        |  5 -----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1ff71b123..816844a0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.3.1.6-rc - 2017-0?-??
+Changes in version 0.3.1.6-rc - 2017-09-05
   Tor 0.3.1.6-rc fixes a few small bugs and annoyances in the 0.3.1
   release series.
 
@@ -6,6 +6,12 @@ Changes in version 0.3.1.6-rc - 2017-0?-??
   find no new bugs or regressions here, the first stable 0.3.1 release
   will be nearly identical to it.
 
+  o Major bugfixes (windows, directory cache):
+    - On windows, do not try to delete cached consensus documents and
+      diffs, until they unmapped from memory. Allow the diff storage
+      directory to grow larger in order to handle files that might need
+      to stay around longer. Fixes bug 22752; bugfix on 0.3.1.1-alpha.
+
   o Minor features (directory authority):
     - Improve the message that authorities report to relays when the
       RSA/Ed25519 key pair they present conflicts with a previously
@@ -43,6 +49,12 @@ Changes in version 0.3.1.6-rc - 2017-0?-??
       and are not relevant to the operator. Fixes bug 23078; bugfix on
       0.3.0.1-alpha and 0.3.0.2-alpha.
 
+  o Minor bugfixes (relay):
+    - When a relay is not running as a directory cache, it will no
+      longer generate compressed consensuses and consensus diff
+      information. Previously, this was a waste of disk and CPU. Fixes
+      bug 23275; bugfix on 0.3.1.1-alpha.
+
   o Minor bugfixes (robustness, error handling):
     - Improve our handling of the cases where OpenSSL encounters a
       memory error while encoding keys and certificates. We haven't
diff --git a/changes/bug22752_simple b/changes/bug22752_simple
deleted file mode 100644
index 7e6035705..000000000
--- a/changes/bug22752_simple
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (windows, directory cache):
-    - On windows, do not try to delete cached consensus documents and
-      diffs, until they unmapped from memory. Allow the diff storage
-      directory to grow larger in order to handle files that might
-      need to stay around longer.  Fixes bug 22752; bugfix on
-      0.3.1.1-alpha.
diff --git a/changes/bug23275 b/changes/bug23275
deleted file mode 100644
index d6c3c4774..000000000
--- a/changes/bug23275
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (relay):
-    - When a relay is not running as a directory cache, it will no longer
-      generate compressed consensuses and consensus diff information.
-      Previously, this was a waste of disk and CPU.  Fixes bug 23275;
-      bugfix on 0.3.1.1-alpha.



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits