Sync with upstream 2011-06-03/5669ec08b530b9bbed5848ec414f8c029e41ab02

[privoxy.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c8e861d..dead1d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -145,7 +145,7 @@ ChangeLog for Privoxy
   - In log_error(), assert that ival and sval have reasonable values.
     There's no reason not to abort() if they don't.
   - Remove an incorrect cgi_error_unknown() call in a
-    cannnot-happen-situation in send_crunch_response().
+    cannot-happen-situation in send_crunch_response().
   - Clean up white-space in http_response definition and
     move the crunch_reason to the beginning.
   - Turn http_response.reason into an enum and rename it