Fwd-port: Add a missing changelog entry back from 0.2.4.11-alpha

When I merged the fix for #7351, and implemented proposal 214 (4-byte
circuit IDs), I forgot to add a changes file.  Later, we never noticed
that it didn't have one.

Resolves ticket #11555.  Thanks to cypherpunks for noticing this was
missing.

This is a cherry-pick of 75e10f58a97f051f7d8576f96c2e32fcb2f07ade into
the master branch.

diff --git a/ChangeLog b/ChangeLog
index 0f81b26151b176e9fe757b31567377a727ba47c5..7ad8373e252247af90d7ed06b7427f8444cc3aa6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1700,6 +1700,10 @@ Changes in version 0.2.4.11-alpha - 2013-03-11
     - Randomize the lifetime of our SSL link certificate, so censors can't
       use the static value for filtering Tor flows. Resolves ticket 8443;
       related to ticket 4014 which was included in 0.2.2.33.
+    - Support a new version of the link protocol that allows 4-byte circuit
+      IDs. Previously, circuit IDs were limited to 2 bytes, which presented
+      a possible resource exhaustion issue. Closes ticket 7351; implements
+      proposal 214.
 
   o Minor features (portability):
     - Tweak the curve25519-donna*.c implementations to tolerate systems