[tor-commits] [tor/release-0.4.1] Fold 30956 into changelog; update date

[nickm at torproject.org]

commit 1d3a2c66581d40096e3ce843213ee9aebca55873
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 25 09:52:32 2019 -0400

    Fold 30956 into changelog; update date
---
 ChangeLog        | 8 +++++++-
 changes/bug30956 | 4 ----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2fb555c63..65bb0ca9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.4.1.3-alpha - 2019-06-24
+Changes in version 0.4.1.3-alpha - 2019-06-25
   Tor 0.4.1.3-alpha resolves numerous bugs left over from the previous
   alpha, most of them from earlier release series.
 
@@ -36,6 +36,12 @@ Changes in version 0.4.1.3-alpha - 2019-06-24
       annotation. We think this bug can only be triggered by modifying a
       local file. Fixes bug 30781; bugfix on 0.2.0.8-alpha.
 
+  o Minor bugfixes (pluggable transports):
+    - Always publish bridge pluggable transport information in the extra
+      info descriptor, even if ExtraInfoStatistics is 0. This
+      information is needed by BridgeDB. Fixes bug 30956; bugfix
+      on 0.4.1.1-alpha.
+
   o Documentation:
     - Mention URLs for Travis/Appveyor/Jenkins in ReleasingTor.md.
       Closes ticket 30630.
diff --git a/changes/bug30956 b/changes/bug30956
deleted file mode 100644
index 8f52a81de..000000000
--- a/changes/bug30956
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (pluggable transports):
-    - Always publish bridge pluggable transport information in the extra info
-      descriptor, even if ExtraInfoStatistics is 0. This information is
-      needed by BridgeDB. Fixes bug 30956; bugfix on 0.4.1.1-alpha.