Fold last entry into changelog

diff --git a/ChangeLog b/ChangeLog
index b3562bf6a4750dcf8567770bb2806d90cc893c7e..f70ce42a7ade09cccc6df96af0208b359a3a4d27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.4.1.1-alpha - 2019-05-??
+Changes in version 0.4.1.1-alpha - 2019-05-22
   This is the first alpha in the 0.4.1.x series. It introduces
   lightweight circuit padding to make some onion-service circuits harder
   to distinguish, includes a new "authenticated SENDME" feature to make
@@ -53,6 +53,18 @@ Changes in version 0.4.1.1-alpha - 2019-05-??
       strong, we are only using it when necessary for performance.
       Implements tickets 29023 and 29536.
 
+  o Major bugfixes (onion service v3):
+    - Fix an unreachable bug in which an introduction point would could
+      try to send an INTRODUCE_ACK with a status code that Trunnel would
+      refuse to encode, leading the relay to assert(). We've
+      consolidated the ABI values into trunnel now. Fixes bug 30454;
+      bugfix on 0.3.0.1-alpha.
+    - Client can now handle unknown status codes from a INTRODUCE_ACK
+      cells. (The NACK behavior will stay the same.) This will allow us
+      to extend status codes in the future without breaking the normal
+      client behavior. Fixes another part of bug 30454; bugfix
+      on 0.3.0.1-alpha.
+
   o Minor features (circuit padding):
     - We now use a fast PRNG when scheduling circuit padding. Part of
       ticket 28636.

diff --git a/changes/ticket30454 b/changes/ticket30454
deleted file mode 100644 (file)
index 77c45d0..0000000
--- a/changes/ticket30454
+++ /dev/null
@@ -1,10 +0,0 @@
-  o Major bugfixes (hidden service v3):
-    - An intro point could try to send an INTRODUCE_ACK with a status code
-      that it wasn't able to encode leading to a hard assert() of the relay.
-      Fortunately, that specific code path can not be reached thus this issue
-      can't be triggered. We've consolidated the ABI values into trunnel now.
-      Fixes bug 30454; bugfix on 0.3.0.1-alpha.
-    - HSv3 client will now be able to properly handle unknown status code from
-      a INTRODUCE_ACK cell (nack) even if they do not know it. The NACK
-      behavior will stay the same. This will allow us to extend status code if
-      we want in the future without breaking the normal client behavior.