From e735b1f37131dbaca1309cc2837198d622bc8acc Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 2 Mar 2013 14:40:18 +0000
Subject: [PATCH] Sync with ChangeLog

---
 doc/source/changelog.sgml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/doc/source/changelog.sgml b/doc/source/changelog.sgml
index fb173eed..7c2e195b 100644
--- a/doc/source/changelog.sgml
+++ b/doc/source/changelog.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Entity included in other project documents.
 
- $Id: changelog.sgml,v 2.1 2013/01/20 18:10:28 fabiankeil Exp $
+ $Id: changelog.sgml,v 2.2 2013/02/27 16:49:20 fabiankeil Exp $
 
  Copyright (C) 2013 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -21,8 +21,10 @@
 -->
 
 <para>
- <application>Privoxy 3.0.21</application> is UNRELEASED.
- The changes since 3.0.20 beta are:
+ <application>Privoxy 3.0.21</application> stable is a bug-fix release
+ for Privoxy 3.0.20 beta. It also addresses a security issue that affects
+ all previous Privoxy versions (on some platforms). The changes since
+ 3.0.20 beta are:
 </para>
 
 <!--
@@ -34,6 +36,14 @@
    <para>
     Bug fixes:
     <itemizedlist>
+    <listitem>
+     <para>
+      On POSIX-like platforms, network sockets with file descriptor
+      values above FD_SETSIZE are properly rejected. Previously they
+      could cause memory corruption in configurations that allowed
+      the limit to be reached.
+     </para>
+    </listitem>
     <listitem>
      <para>
       Compiles on OS/2 again now that unistd.h is only included
@@ -41,6 +51,8 @@
      </para>
     </listitem>
     </itemizedlist>
+   </para>
+  </listitem>
   <listitem>
    <para>
     General improvements:
@@ -61,6 +73,12 @@
       Added an LSB info block to the generic start script.
       Based on a patch from Natxo Asenjo.
      </para>
+    </listitem>
+    <listitem>
+     <para>
+      The max-client-connections default has been changed to 128
+      which should be more than enough for most setups.
+     </para>
      </listitem>
     </itemizedlist>
    </para>
-- 
2.39.2