Fold in the entry for 2667

diff --git a/ChangeLog b/ChangeLog
index e219c4786f601e33ac7a436338ee2b05077f9d9a..48402f4ed23970d9f63f93c4938f4af3d0ad3086 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 Changes in version 0.3.5.13 - 2020-02-03
   Tor 0.3.5.13 backports numerous bugfixes from later releases,
   including one that made v3 onion services more susceptible to
-  denial-of-service attacks.
+  denial-of-service attacks, and a feature that makes some kinds of
+  DoS attacks harder to perform.
 
   o Major bugfixes (onion service v3, backport from 0.4.5.3-rc):
     - Stop requiring a live consensus for v3 clients and services, and
@@ -16,6 +17,12 @@ Changes in version 0.3.5.13 - 2020-02-03
       clients. Now we count traffic from both clients and services.
       Fixes bug 40117; bugfix on 0.2.6.2-alpha.
 
+  o Major feature (exit, backport from 0.4.5.5-rc):
+    - Re-entry into the network is now denied at the Exit level to all
+      relays' ORPorts and authorities' ORPorts and DirPorts. This change
+      should help mitgate a set of denial-of-service attacks. Closes
+      ticket 2667.
+
   o Minor feature (build system, backport from 0.4.5.4-rc):
     - New "make lsp" command to generate the compile_commands.json file
       used by the ccls language server. The "bear" program is needed for

diff --git a/changes/ticket2667 b/changes/ticket2667
deleted file mode 100644 (file)
index cc42286..0000000
--- a/changes/ticket2667
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major feature (exit):
-    - Re-entry into the network is now denied at the Exit level to all relays'
-      ORPort and authorities' ORPort+DirPort. This is to help mitigate a series
-      of attacks. See ticket for more information. Closes ticket 2667.