fold entries into an 0.3.1.6-rc changelog

13 files changed, 72 insertions, 60 deletions

diff --git a/ChangeLog b/ChangeLog
index dfa1ae08b6..b124ff5992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,75 @@
+Changes in version 0.3.1.6-rc - 2017-0?-??
+  Tor 0.3.1.6-rc fixes a few small bugs and annoyances in the 0.3.1 release
+  series.
+
+  This is the first release candidate in the Tor 0.3.1 series. If we
+  find no new bugs or regressions here, the first stable 0.3.1 release
+  will be nearly identical to it.
+
+  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
+      pinned key. Closes ticket 22348.
+
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the August 3 2017 Maxmind GeoLite2
+      Country database.
+
+  o Minor features (testing):
+    - Add a couple more tests for compression backend initialization.
+      Closes ticket 22286.
+
+  o Minor bugfixes (directory cache):
+    - Fix a memory leak in the code that recovers space in the consensus
+      directory cache. Fixes bug 23139; bugfix on 0.3.1.1-alpha.
+
+  o Minor bugfixes (hidden service):
+    - A service is allowed to open a maximum number of circuits for a specific
+      period of time. That value was lower than it should be (8 vs 12) in the
+      normal case of 3 introduction points. Fixes bug 22159; bugfix on
+      0.3.0.5-rc.
+    - Fix a BUG alert during HSv3 descriptor decoding that could trigger with a
+      specially crafted descriptor. Fixes bug 23233; bugfix on 0.3.0.1-alpha.
+      Bug found by "haxxpop".
+    - Rate limit the log if we ever go above the maximum number of allowed
+      intro circuits. Fixes bug 22159; bugfix on 0.3.1.1-alpha.
+
+  o Minor bugfixes (logging, relay):
+    - Remove a log_warn() that has been forgotten when an introduction point
+      successfully established a hidden service prop224 circuit with a client.
+    - Three other log_warn() for an introduction point have been changed to
+      protocol warning because they can be failure from the network 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 (robustness, error handling):
+    - Improve our handling of the cases where OpenSSL encounters a
+      memory error while encoding keys and certificates. We haven't
+      observed these happening in the wild, but if they do happen,
+      we now detect and respond better. Fixes bug 19418; bugfix
+      on all versions of Tor. Reported by Guido Vranken.
+
+  o Minor bugfixes (stability):
+    - Avoid crashing on double-free when unable to load or process
+      an included file. Fixes bug 23155; bugfix on 0.3.1.1-alpha.
+      Found with the clang static analyzer.
+
+  o Minor bugfixes (testing):
+    - Fix an undersized buffer in test-memwipe.c. Fixes bug 23291; bugfix on
+      0.2.7.2-alpha. Found and patched by Ties Stuij.
+    - Port the hs_ntor handshake test to work correctly with recent
+      versions of the pysha3 module. Fixes bug 23071; bugfix on
+      0.3.1.1-alpha.
+
+  o Minor bugfixes (Windows service):
+    - When running as a Windows service, set the ID of the main thread
+      correctly. Failure to do so made us fail to send log messages
+      to the controller in 0.2.1.16-rc, slowed down controller
+      event delivery in 0.2.7.3-rc and later, and crash with an assertion
+      failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha.
+      Patch and diagnosis from "Vort".
+
+
 Changes in version 0.3.1.5-alpha - 2017-08-01
   Tor 0.3.1.5-alpha improves the performance of consensus diff
   calculation, fixes a crash bug on older versions of OpenBSD, and fixes
diff --git a/changes/bug19418 b/changes/bug19418
deleted file mode 100644
index fb5f6ad5df..0000000000
--- a/changes/bug19418
+++ /dev/null
@@ -1,7 +0,0 @@
-  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
-      observed these happening in the wild, but if they do happen,
-      we now detect and respond better. Fixes bug 19418; bugfix
-      on all versions of Tor. Reported by Guido Vranken.
-
diff --git a/changes/bug22159 b/changes/bug22159
deleted file mode 100644
index 03858fe964..0000000000
--- a/changes/bug22159
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (hidden service):
-    - A service is allowed to open a maximum number of circuits for a specific
-      period of time. That value was lower than it should be (8 vs 12) in the
-      normal case of 3 introduction points. Fixes bug 22159; bugfix on
-      0.3.0.5-rc.
-    - Rate limit the log if we ever go above the maximum number of allowed
-      intro circuits. Fixes bug 22159; bugfix on 0.3.1.1-alpha.
diff --git a/changes/bug22286 b/changes/bug22286
deleted file mode 100644
index f72e8fe2c7..0000000000
--- a/changes/bug22286
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (tests):
-    - Add a couple more tests for compression backend initialization.
-      Closes ticket 22286.
diff --git a/changes/bug23071 b/changes/bug23071
deleted file mode 100644
index 4756dd6252..0000000000
--- a/changes/bug23071
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (tests):
-    - Port the hs_ntor handshake test to work correctly with recent
-      versions of the pysha3 module. Fixes bug 23071; bugfix on
-      0.3.1.1-alpha.
-
diff --git a/changes/bug23078 b/changes/bug23078
deleted file mode 100644
index c06774edb1..0000000000
--- a/changes/bug23078
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (logging, relay):
-    - Remove a log_warn() that has been forgotten when an introduction point
-      successfully established a hidden service prop224 circuit with a client.
-    - Three other log_warn() for an introduction point have been changed to
-      protocol warning because they can be failure from the network and are
-      not relevant to the operator. Fixes bug 23078; bugfix on
-      0.3.0.1-alpha and 0.3.0.2-alpha.
diff --git a/changes/bug23081 b/changes/bug23081
deleted file mode 100644
index 76c4e30971..0000000000
--- a/changes/bug23081
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes (Windows service):
-    - When running as a Windows service, set the ID of the main thread
-      correctly. Failure to do so made us fail to send log messages
-      to the controller in 0.2.1.16-rc, slowed down controller
-      event delivery in 0.2.7.3-rc and later, and crash with an assertion
-      failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha.
-      Patch and diagnosis from "Vort".
-
diff --git a/changes/bug23139 b/changes/bug23139
deleted file mode 100644
index ed63ce85e2..0000000000
--- a/changes/bug23139
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (directory cache):
-    - Fix a memory leak in the code that recovers space in the consensus
-      directory cache. Fixes bug 23139; bugfix on 0.3.1.1-alpha.
diff --git a/changes/bug23155 b/changes/bug23155
deleted file mode 100644
index 4c24ab136c..0000000000
--- a/changes/bug23155
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (stability):
-    - Avoid crashing on double-free when unable to load or process
-      an included file. Fixes bug 23155; bugfix on 0.3.1.1-alpha.
-      Found with the clang static analyzer.
diff --git a/changes/bug23233 b/changes/bug23233
deleted file mode 100644
index 4cf152aeeb..0000000000
--- a/changes/bug23233
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (hidden service):
-    - Fix a BUG alert during HSv3 descriptor decoding that could trigger with a
-      specially crafted descriptor. Fixes bug 23233; bugfix on 0.3.0.1-alpha.
-      Bug found by "haxxpop".
diff --git a/changes/bug23291 b/changes/bug23291
deleted file mode 100644
index a5b0efda0a..0000000000
--- a/changes/bug23291
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (testing):
-    - Fix an undersized buffer in test-memwipe.c. Fixes bug 23291; bugfix on
-      0.2.7.2-alpha. Found and patched by Ties Stuij.
diff --git a/changes/geoip-august2017 b/changes/geoip-august2017
deleted file mode 100644
index 7907218d2a..0000000000
--- a/changes/geoip-august2017
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-    - Update geoip and geoip6 to the August 3 2017 Maxmind GeoLite2
-      Country database.
-
diff --git a/changes/ticket22348 b/changes/ticket22348
deleted file mode 100644
index 49ae94cdf3..0000000000
--- a/changes/ticket22348
+++ /dev/null
@@ -1,5 +0,0 @@
-  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
-      pinned key. Closes ticket 22348.
-