diff --git a/CHANGES b/CHANGES
index 8bc488f5..9b1cd32c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,13 @@
 CHANGES FROM 2.5 to master
 
+* Do not allow escape sequences which expect a specific terminator (APC, DSC,
+  OSC) to wait for forever - use a small timeout. This reduces the chance of
+  the pane locking up completely when sent garbage (cat /dev/random or
+  similar).
+
+* Support SIGUSR2 to toggle logging on a running server, also generate the
+  "out" log file with -vv not -vvvv.
+
 * Make set-clipboard a three state option: on (tmux both sends to outside
   terminal and accepts from applications inside); external (tmux sends outside
   but does not accept inside); and off.
diff --git a/CONTRIBUTING b/CONTRIBUTING
index d1949b7b..467c5c3a 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -27,7 +27,7 @@ case before opening an issue.
 To run tmux without a config and get logs, run:
 
     tmux -Ltest kill-server
-    tmux -vvvv -Ltest -f/dev/null new
+    tmux -vv -Ltest -f/dev/null new
 
 Then reproduce the problem, exit tmux, and attach the tmux-server-*.log file
 from the current directory to the issue.