update

diff --git a/ChangeLog b/ChangeLog
index 4c8bf7000e52c23e215bdb4870b827bf51091a43..c751eeaa60993d7b9ad01aadfda2a3150f56e6fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ Changes to squid-1.1.beta20 (November 13, 1996):
        - Fixed Cache-Control counting in HTTP reply header stats.
        - Relocated rfc1738_unescape() calls in ftpget so that
          ftp://foo.org/%2fbar/ works (Jonathan Larmour).
+       - Fixed forwarding loop for a pair of neighbors behind a firewall.
+       - Cleaned up ftpget non-blocking flags (Jean-Hugues ROYER).
 
 Changes to squid-1.1.beta19 (November 13, 1996):