[tor-commits] [tor/release-0.4.1] Fold three more entries into changelog.

[nickm at torproject.org]

commit 3c248f7866f40018acf16391d3120c593006d189
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 18 08:15:19 2019 -0400

    Fold three more entries into changelog.
---
 ChangeLog           | 16 ++++++++++++++++
 changes/bug31657    |  5 -----
 changes/doc31089    |  4 ----
 changes/ticket31772 |  4 ----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 956d8cab2..71a889626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,17 @@ Changes in version 0.4.1.6 - 2019-09-??
       floating-point classifier functions on FreeBSD. Fixes part of bug
       31687; bugfix on 0.3.1.5-alpha.
 
+  o Minor bugfixes (controller protocol):
+    - Fix the MAPADDRESS controller command to accept one or more
+      arguments. Previously, it required two or more arguments, and ignored
+      the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.
+
+  o Minor bugfixes (guards, backport from 0.4.2.1-alpha):
+    - When tor is missing descriptors for some primary entry guards,
+      make the log message less alarming. It's normal for descriptors to
+      expire, as long as tor fetches new ones soon after. Fixes bug
+      31657; bugfix on 0.3.3.1-alpha.
+
   o Minor bugfixes (logging, backport from 0.4.2.1-alpha):
     - Change log level of message "Hash of session info was not as
       expected" to LOG_PROTOCOL_WARN. Fixes bug 12399; bugfix
@@ -60,6 +71,11 @@ Changes in version 0.4.1.6 - 2019-09-??
       single onion services failed when all intro nodes were unreachable
       via a 1-hop path. Fixes bug 23507; bugfix on 0.3.2.1-alpha.
 
+  o Documentation (backport from 0.4.2.1-alpha):
+    - Use RFC 2397 data URL scheme to embed an image into tor-exit-
+      notice.html so that operators no longer have to host it
+      themselves. Closes ticket 31089.
+
 
 Changes in version 0.4.1.5 - 2019-08-20
   This is the first stable release in the 0.4.1.x series. This series
diff --git a/changes/bug31657 b/changes/bug31657
deleted file mode 100644
index 08e9d95fd..000000000
--- a/changes/bug31657
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (guards):
-    - When tor is missing descriptors for some primary entry guards, make the
-      log message less alarming. It's normal for descriptors to expire, as long
-      as tor fetches new ones soon after. Fixes bug 31657;
-      bugfix on 0.3.3.1-alpha.
diff --git a/changes/doc31089 b/changes/doc31089
deleted file mode 100644
index 2fc0ba4f7..000000000
--- a/changes/doc31089
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Documentation:
-    - Use RFC 2397 data URL scheme to embed image into tor-exit-notice.html
-      so that operators would no longer have to host it themselves.
-      Closes ticket 31089.
diff --git a/changes/ticket31772 b/changes/ticket31772
deleted file mode 100644
index 7847b3f74..000000000
--- a/changes/ticket31772
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (controller protocol):
-    - Fix the MAPADDRESS controller command to accept one or more
-      arguments. Previously, it required two or more arguments, and ignored
-      the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.