X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=ChangeLog;h=51ed4532ac672b975a3c978c766058a54f3358e8;hp=3ece1bc559ff7378e57b0fa2211ac357bc9ca470;hb=fbebb8d238f73eabbdaaec3b8e5ef745ef80b6e9;hpb=36f5fa200c2685ff053539184c83f1d909f0da05

diff --git a/ChangeLog b/ChangeLog
index 3ece1bc5..51ed4532 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,1165 @@
 --------------------------------------------------------------------
 ChangeLog for Privoxy
 --------------------------------------------------------------------
-*** Since 3.0.8 ***
+*** Version 3.0.20 Beta ***
 
-- Added SOCKS5 support. Patch provided by Eric M. Hopper.
+- Bug fixes:
+  - Client sockets are now properly shutdown and drained before being
+    closed. This fixes page truncation issues with clients that aggressively
+    pipeline data on platforms that otherwise discard already written data.
+    The issue mainly affected Opera users and was initially reported
+    by Kevin in #3464439, szotsaki provided additional information to track
+    down the cause.
+  - Fix latency calculation for shared connections (disabled by default).
+    It was broken since their introduction in 2009. The calculated latency
+    for most connections would be 0 in which case the timeout detection
+    failed to account for the real latency.
+  - Reject URLs with invalid port. Previously they were parsed incorrectly and
+    characters between the port number and the first slash were silently
+    dropped as shown by curl test 187.
+  - The default-server-timeout and socket-timeout directives accept 0 as
+    valid value.
+  - Fix a race condition on Windows that could cause Privoxy to become
+    unresponsive after toggling it on or off through the taskbar icon.
+    Reported by Tim H. in #3525694.
+  - Fix the compilation on Windows when configured without IPv6 support.
+  - Fix an assertion that could cause debug builds to abort() in case of
+    socks5 connection failures with "debug 2" enabled.
+  - Fix an assertion that could cause debug builds to abort() if a filter
+    contained nul bytes in the replacement text.
+
+- General improvements:
+  - Significantly improved keep-alive support for both client and server
+    connections.
+  - New debug log level 65536 which logs all actions that were applied to each
+    request that Privoxy acts upon.
+  - New directive client-header-order can be used to forward client headers in
+    a different order than that in which they arrived.
+  - New directive tolerate-pipelining can be used to enable client-side
+    pipelining. If enabled (3.0.20 beta enables it by default), Privoxy will
+    keep pipelined client requests around to deal with them once the current
+    request has been served.
+  - New --config-test option lets Privoxy exit after checking whether or not
+    the configuration seems valid. The limitations noted in TODO #22 and #23
+    still apply. Logging the problem to the logfile if one is configured and
+    --no-daemon isn't used could be considered non-intuitive and might also
+    clobber messages emitted by an already running instance. Based on a patch
+    by Ramkumar Chinchani.
+  - Add limit-cookie-lifetime{} action. It can be used to let cookies expire
+    before the end of the session. limit-cookie-lifetime{0} creates session
+    cookies and can thus replace the session-cookies-only action in the future.
+    Idea originally suggested by Rick Sykes in #1049575.
+  - Increase the hard-coded maximum number of actions and filter files from
+    10 to 30 (each). It doesn't significantly affect Privoxy's memory usage
+    and recompiling wasn't an option for all Privoxy users that reached the
+    limit.
+  - Add support for chunk-encoded client request bodies. Previously
+    chunk-encoded request bodies weren't guaranteed to be forwarded correctly,
+    so this can also be considered a bug fix although chunk-encoded request
+    bodies aren't commonly used in the real world.
+  - Add support for Tor's optimistic-data SOCKS extension, which can reduce the
+    latency for requests on newly created connections. Currently only the
+    headers are sent optimistically and only if the client request has already
+    been read completely which rules out requests with large bodies.
+  - After preventing the client from pipelining, don't signal keep-alive
+    intentions. When looking at the response headers alone, it previously
+    wasn't obvious from the client's perspective that no additional responses
+    should be expected.
+  - Stop considering client sockets tainted after receving a request with body.
+    It hasn't been necessary for a while now and unnecessarily causes test
+    failures when using curl's test suite.
+  - Allow HTTP/1.0 clients to signal interest in keep-alive through the
+    Proxy-Connection header. While such client are rare in the real world, it
+    doesn't hurt and couple of curl tests rely on it.
+  - Only remove duplicated Content-Type headers when filters are enabled.
+    If they are not it doesn't cause ill effects and the user might not want it.
+    Downgrade the removal message to LOG_LEVEL_HEADER to clarify that it's not
+    an error in Privoxy and is unlikely to cause any problems in general.
+    Anonymously reported in #3599335.
+  - Set the socket option SO_LINGER for the client socket in
+    accept_connection(). This should further reduce the chances of the client
+    getting an incomplete response, even though Privoxy wrote it in its
+    entirety to the socket.
+  - Move several variable declarations to the beginning of their code block.
+    It's how we usually do it and is apparently also required when compiling
+    with gcc 2.95. Initial patch submitted by Simon South in #3564815.
+  - Optionally let parse_header_time() sanity check strptime() results before
+    trusting them. Broken strptime() implementations have caused problems in
+    the past and the most recent offender seems to be FreeBSD's libc:
+    http://www.freebsd.org/cgi/query-pr.cgi?pr=173421
+  - Attempt to work around (or at least reduce the) video playback issues with
+    various Apple clients as reported in #3426305. In client_range(), let
+    headers pass if the range starts at the beginning.
+  - Do not confuse a client hanging up with a connection time out. If a client
+    closes its side of the connection without sending a request line, do not
+    send the CLIENT_CONNECTION_TIMEOUT_RESPONSE, but report the condition
+    properly.
+  - Allow closing curly braces as part of action values as long as they are
+    escaped.
+  - On Windows, the logfile is now written before showing the GUI error
+    message which blocks until the user acknowledges it.
+    Reported by Adriaan in #3593603.
+
+- Action file improvements:
+  - Remove the comment that indicated that updated versions of this file are
+    released on their own.
+  - Block 'optimize.indieclick.com/' and 'optimized-by.rubiconproject.com/'
+  - Unblock 'adjamblog.wordpress.com/' and 'adjamblog.files.wordpress.com/'.
+    Reported by Ryan Farmer in #3496116.
+  - Unblock '/.*Bugtracker'. Reported by pwhk in #3522341.
+  - Add test URLs for '.freebsd.org' and '.watson.org'.
+  - Unblock '.urbandictionary.com/popular'.
+  - Block '.adnxs.com/'.
+  - Block 'farm.plista.com/widgetdata.php'.
+  - Block 'rotation.linuxnewmedia.com/'.
+  - Block 'reklamy.sfd.pl/'. Reported by kacperdominik in #3399948.
+  - Block 'g.adspeed.net/'.
+  - Unblock 'websupport.wdc.com/'. Reported by Adam Piggot in #3577851.
+  - Block '/openx/www/delivery/'.
+  - Disable fast-redirects for '.googleapis.com/'.
+  - Block 'imp.double.net/'. Reported by David Bo in #3070411.
+  - Block 'gm-link.com/' whis is used for email tracking.
+    Reported by David Bo in #1812733.
+  - Verify that requests to "bwp." are blocked. URL taken from #1736879
+    submitted by Francois Marier.
+  - Block '/.*bannerid='. Reported by Adam Piggott in #2975779.
+  - Block 'cltomedia.info/delivery/' and '.adexprt.com/'.
+    Anonymously reported in #2965254.
+  - Block 'de17a.com/'. Reported by David Bo in #3061472.
+  - Block 'oskar.tradera.com/'. Reported by David Bo in #3060596.
+  - Block '/scripts/webtrends\.js'. Reported by johnd16 in #3002729.
+  - Block requests for 'pool.*.adhese.com/'. Reported by johnd16 in #3002716.
+  - Update path pattern for Coremetrics and add tests.
+    Pattern and URLs submitted by Adam Piggott #3168443.
+  - Enable +fast-redirects{check-decoded-url} for 'tr.anp.se/'.
+    Reported by David Bo in #3268832.
+  - Unblock '.conrad.se/newsletter/banners/'. Reported by David Bo in #3413824.
+  - Block '.tynt.com/'. Reported by Dan Stahlke in #3421767.
+  - Unblock '.bbci.co.uk/radio/'. Reported by Adam Piggott in #3569603.
+  - Block requests to 'service.maxymiser.net/'.
+    Reported by johnd16 in #3118401 (with a previous URL).
+  - Disable fast-redirects for Google's "let's pretend your computer is
+    infected" page.
+  - Unblock '/.*download' to resolve actionsfile feedback #3498129.
+    Submitted by Steven Kolins (soundcloud.com not working).
+  - Unblock '.wlxrs.com/' which is required by hotmail.com.
+    Fixes #3413827 submitted by David Bo.
+  - Add two unblock patterns for popup radio and TV players.
+    Submitted by Adam Piggott in #3596089.
+
+- Filter file improvements & bug fixes:
+  - Add a referer tagger.
+  - Reduce the likelihood that the google filter messes up HTML-generating
+    JavaScript. Reported by Zeno Kugy in #3520260.
+
+- Documentation improvements:
+  - Revised all OS X sections due to new packaging module (OSXPackageBuilder).
+  - Update the list of supported operating systems to clarify that all Windows
+    versions after 95 are expected to work and note that the platform-specific
+    code for AmigaOS and QNX currently isn't maintained.
+  - Update 'Signals' section, the only explicitly handled signals are SIGINT,
+    SIGTERM and SIGHUP.
+  - Add Haiku to the list of operating systems on which Privoxy is known to
+    run.
+  - Add DragonFly to the list of BSDs on which Privoxy is known to run.
+  - Removed references to redhat-specific documentation set since it no longer
+    exists.
+  - Removed references to building PDFs since we no longer do so.
+  - Multiple listen-address directives are supported since 3.0.18, correct the
+    documentation to say so.
+  - Remove bogus section about long and short being preferable to int.
+  - Corrected some Internet JunkBuster references to Privoxy.
+  - Removed references to www.junkbusters.com since it is no longer
+    maintained. Reported by Angelina Matson.
+  - Various grammar and spelling corrections
+  - Add a client-header-tagger{} example for disabling filtering for range
+    requests.
+  - Correct a URL in the "Privoxy with Tor" FAQ.
+  - Spell 'refresh-tags' correctly. Reported by Don in #3571927.
+  - Sort manpage options alphabetically.
+  - Remove an incorrect sentence in the toggle section. The toggle state
+    doesn't affect whether or not the Windows version uses the tray icon and
+    having to toggle Privoxy off to not show the icon makes no sense anyway.
+    Reported by Zeno Kugy in #3596395.
+  - Add the DNT header to the client-header-order example.
+  - Add new contributors since 3.0.19.
+
+- Log message improvements:
+  - When stopping to watch a client socket due to pipelining, additionally log
+    the socket number.
+  - log the client socket and its condition before closing it. This makes it
+    more obvious that the socket actually gets closed and should help when
+    diagnosing problems like #3464439.
+  - In case of SOCKS5 failures, do not explicitly log the server's response.
+    It hasn't helped so far and the response can already be logged by enabling
+    "debug 32768" anyway. This reverts v1.81 and the follow-up bug fix v1.84.
+  - Relocate the connection-accepted message from listen_loop() to serve().
+    This way it's printed by the thread that is actually serving the
+    connection which is nice when grepping for thread ids in log files. While
+    at it, use an upper-case first character which is more consistent with the
+    other log messages.
+
+- Code cleanups:
+  - Remove compatibility layer for versions prior to 3.0 since it has been
+    obsolete for more than 10 years now.
+  - Remove the ijb_isupper() and ijb_tolower() macros from parsers.c since
+    they aren't used in this file.
+  - Removed the 'Functions declared include:' comment sections since they tend
+    to be incomplete, incorrect and out of date and the benefit seems
+    questionable.
+  - Various comment grammar and comprehensibility improvements.
+  - Remove a pointless fflush() call in chat(). Flushing all streams pretty
+    much all the time for no obvious reason is ridiculous.
+  - Relocate ijb_isupper()'s definition to project.h and get the ijb_tolower()
+    definition from there, too.
+  - Relocate ijb_isdigit()'s definition to project.h.
+  - Rename ijb_foo macros to privoxy_foo.
+  - Add malloc_or_die() which will allow to simplify code paths where malloc()
+    failures don't need to be handled gracefully.
+  - Add strdup_or_die() which will allow to simplify code paths where strdup()
+    failures don't need to be handled gracefully.
+  - Replace strdup() calls with strdup_or_die() calls where it's safe and
+    simplifies the code.
+  - Fix white-space around parentheses.
+  - Add missing white-space behind if's and the following parentheses.
+  - Unwrap a memcpy() call in resolve_hostname_to_ip().
+  - Declare pcrs_get_delimiter()'s delimiters[] static const.
+  - Various optimisations to remove dead code and merge inefficient code
+    structures for improved clarity, performance or code compactness.
+  - Various data type corrections.
+  - Change visibility of several code segments when compiling without
+    FEATURE_CONNECTION_KEEP_ALIVE enabled for clarity.
+  - In pcrs_get_delimiter(), do not use delimiters ouside the ASCII range.
+    Fixes a clang complaint.
+  - Fix an error message in get_last_url() nobody is supposed to see.
+    Reported by Matthew Fischer in #3507301.
+  - Fix a typo in the no-zlib-support complaint. Patch submitted by Matthew
+    Fischer in #3507304.
+  - Update an error message that still tried to print directive_hash as long
+  - Shorten ssplit()'s prototype by removing the last two arguments. We always
+    want to skip empty fields and ignore leading delimiters, so having
+    parameters for this only complicates the API.
+  - Use an enum for the type of the action value.
+  - Rename action_name's member takes_value to value_type as it isn't used as
+    boolean.
+  - Turn family mismatches in match_sockaddr() into fatal errors.
+  - Let enlist_unique_header() verify that the caller didn't pass a header
+    containing either \r or \n.
+  - Change the hashes used in load_config() to unsigned int.
+    That's what hash_string() actually returns and using a potentiallly larger
+    type is at best useless.
+  - Use privoxy_tolower() instead of vanilla tolower() with manual casting of
+    the argument.
+
+- Privoxy-Regression-Test:
+  - Various grammar and spelling corrections in documentation and code.
+  - Additional tests for range requests with filtering enabled.
+  - Tests with mostly invalid range request.
+  - Log to STDOUT instead of STDERR.
+  - Add a couple of hide-if-modified-since{} tests with different date formats.
+  - Cleaned up the format of the regression-tests.action file to match the
+    format of default.action.
+  - Remove the "Copyright" line from print_version(). When using --help, every
+    line of screen space matters and thus shouldn't be wasted on things the
+    user doesn't care about.
+  - Fix comment typos.
+  - Add an 'Overwrite condition' directive to skip any matching tests before
+    it. As it has a global scope, using it is more convenient than clowning
+    around with the Ignore directive.
+  - Include the Privoxy version in the output.
+
+- Privoxy-Log-Parser:
+  - Improve the --statistics performance by skipping sanity checks for input
+    that shouldn't affect the results anyway. In my non-scientific benchmarks
+    this reduces the runtime by about 45%. Also add a --strict-checks option
+    that enables some of the checks again, just in case anybody cares.
+  - Accept and highlight: Stopping to watch the client socket. There's already
+    another request waiting.
+  - Cleanup variable initialization in print_non_clf_message().
+  - Properly highlight the new log messages from get_request_line().
+  - Let get_percentage() show 0 of x as 0% even if x is 0 as well.
+  - Accept and ignore: Enlisting (sorted|left-over) header ...
+  - Accept the shiny new LOG_LEVEL_ACTIONS.
+  - Accept and highlight: Closing client socket 5. Keep-alive: 0, Socket
+    alive: 1. Data available: 0.
+  - Stop suppressing messages about accepted client connections and highlight
+    them properly.
+  - Accept and highlight: Accepted connection from 10.0.0.1 on socket 5.
+  - Accept and highlight: Continuing buffering server headers from socket 5.
+    Bytes most recently read: 498.
+  - Accept and highlight: Client request 4 arrived in time on socket 7.
+  - Accept and highlight: Closing client socket 8. Keep-alive: 1. Socket
+    alive: 0. Data available: 0. Configuration file change detected: 0.
+    Requests received: 11.
+  - Accept and highlight: Drained 180 bytes before closing socket 6.
+  - Accept and highlight the extended log message for client sockets.
+  - Accept and highlight: Tainting client socket 7 due to unread data.
+  - Accept and highlight: Optimistically sending 318 bytes of client
+    headers intended for www.privoxy.org.
+  - Accept and highlight: Client request 8 has been pipelined on socket 7 and
+    the socket is still alive.
+  - Accept: There better be a request body.
+  - Accept and highlight: Shifting 360 pipelined bytes by 360 bytes.
+  - Accept and highlight: Multiple Content-Type headers detected. Removing and
+    ignoring: Content-Type: text/html.
+
+- uagen:
+  - Bump generated Firefox version to 16.
+
+- CGI interface improvements & bug fixes:
+  - Remove an unreasonable parameter limit in parse_cgi_parameters(). The new
+    parameter limit depends on the memory available and is currently unlikely
+    to be reachable, due to other limits in both Privoxy and common clients.
+    Reported by Andrew on ijbswa-users@.
+  - Catch ssplit() failures in parse_cgi_parameters().
+  - Deal with unsupported methods sent to the CGI pages by discarding any
+    data following the headers.
+
+- GNUmakefile improvements:
+  - The dok-tidy target no longer taints documents with a tidy-mark
+  - Change RA_MODE from 0664 to 0644. Suggested by Markus Dittrich in
+    #3505445.
+  - Remove tidy's clean flag as it changes the scope of attributes.
+    Link-specific colors end up being applied to all text. Reported by Adam
+    Piggott in #3569551.
+  - Leave it up to the user whether or not smart tags are inserted.
+  - Let w3m itself do the line wrapping for the config file. It works better
+    than fmt as it can honour pre tags causing less unintentional line breaks.
+  - Ditch a pointless '-r' passed to rm to delete files.
+  - Prevent completely empty lines in configure and try to unfold
+    unintentional line breaks.
+  - Let the config-file target optimistically update the original. Most of the
+    issues are fixed now and it makes diffing with git easier.
+  - Change WDUMP to generate ASCII. Add WDUMP_UTF8 to allow UTF-8 in the
+    AUTHORS file so the names are right.
+  - Stop pretending that lynx and links are supported for the documentation.
+
+- configure improvements:
+  - On Haiku, do not pass -lpthread to the compiler. Haiku's pthreads
+    implementation is contained in its system library, libroot, so no
+    additional library needs to be searched. Patch submitted by Simon South in
+    #3564815.
+  - Additional Haiku-specific improvements. Disable checks intended for
+    multi-user systems as Haiku is presently single-user. Group Haiku-specific
+    settings in their own section, following the pattern for Solaris, OS/2 and
+    AmigaOS. Add additional library-related settings to remove the need for
+    providing configure with custom LDFLAGS. Submitted by Simon South in
+    #3574538.
+  - Several improvements for clarity, diffability and logic.
+
+  *** Version 3.0.19 Stable ***
+
+- Bug fixes:
+  - Prevent a segmentation fault when de-chunking buffered content.
+    It could be triggered by malicious web servers if Privoxy was
+    configured to filter the content and running on a platform
+    where SIZE_T_MAX isn't larger than UINT_MAX, which probably
+    includes most 32-bit systems. On those platforms, all Privoxy
+    versions before 3.0.19 appear to be affected.
+    To be on the safe side, this bug should be presumed to allow
+    code execution as proving that it doesn't seems unrealistic.
+  - Do not expect a response from the SOCKS4/4A server until it
+    got something to respond to. This regression was introduced
+    in 3.0.18 and prevented the SOCKS4/4A negotiation from working.
+    Reported by qqqqqw in #3459781.
+
+- General improvements:
+  - Fix an off-by-one in an error message about connect failures.
+  - Use a GNUMakefile variable for the webserver root directory and
+    update the path. Sourceforge changed it which broke various
+    web-related targets.
+  - Update the CODE_STATUS description.
+
+*** Version 3.0.18 Stable ***
+
+- Bug fixes:
+  - If a generated redirect URL contains characters RFC 3986 doesn't
+    permit, they are (re)encoded. Not doing this makes Privoxy versions
+    from 3.0.5 to 3.0.17 susceptible to HTTP response splitting (CWE-113)
+    attacks if the +fast-redirects{check-decoded-url} action is used.
+  - Fix a logic bug that could cause Privoxy to reuse a server
+    socket after it got tainted by a server-header-tagger-induced
+    block that was triggered before the whole server response had
+    been read. If keep-alive was enabled and the request following
+    the blocked one was to the same host and using the same forwarding
+    settings, Privoxy would send it on the tainted server socket.
+    While the server would simply treat it as a pipelined request,
+    Privoxy would later on fail to properly parse the server's
+    response as it would try to parse the unread data from the
+    first response as server headers for the second one.
+    Regression introduced in 3.0.17.
+  - When implying keep-alive in client_connection(), remember that
+    the client didn't. Fixes a regression introduced in 3.0.13 that
+    would cause Privoxy to wait for additional client requests after
+    receiving a HTTP/1.1 request with "Connection: close" set
+    and connection sharing enabled.
+    With clients which terminates the client connection after detecting
+    that the whole body has been received it doesn't really matter,
+    but with clients that don't the connection would be kept open until
+    it timed out.
+  - Fix a subtle race condition between prepare_csp_for_next_request()
+    and sweep(). A thread preparing itself for the next client request
+    could briefly appear to be inactive.
+    If all other threads were already using more recent files,
+    the thread could get its files swept away under its feet.
+    So far this has only been reproduced while stress testing in
+    valgrind while touching action files in a loop. It's unlikely
+    to have caused any actual problems in the real world.
+  - Disable filters if SDCH compression is used unless filtering is forced.
+    If SDCH was combined with a supported compression algorithm, Privoxy
+    previously could try to decompress it and ditch the Content-Encoding
+    header even though the SDCH compression wasn't dealt with.
+    Reported by zebul666 in #3225863.
+  - Make a copy of the --user value and only mess with that when splitting
+    user and group. On some operating systems modifying the value directly
+    is reflected in the output of ps and friends and can be misleading.
+    Reported by zepard in #3292710.
+  - If forwarded-connect-retries is set, only retry if Privoxy is actually
+    forwarding the request. Previously direct connections would be retried
+    as well.
+  - Fixed a small memory leak when retrying connections with IPv6
+    support enabled.
+  - Remove an incorrect assertion in compile_dynamic_pcrs_job_list()
+    It could be triggered by a pcrs job with an invalid pcre
+    pattern (for example one that contains a lone quantifier).
+  - If the --user argument user[.group] contains a dot, always bail out
+    if no group has been specified. Previously the intended, but undocumented
+    (and apparently untested), behaviour was to try interpreting the whole
+    argument as user name, but the detection was flawed and checked for '0'
+    instead of '\0', thus merely preventing group names beginning with a zero.
+  - In html_code_map[], use a numeric character reference instead of '
+    which wasn't standardized before XHTML 1.0.
+  - Fix an invalid free when compiled with FEATURE_GRACEFUL_TERMINATION
+    and shut down through http://config.privoxy.org/die
+  - In get_actions(), fix the "temporary" backwards compatibility hack
+    to accept block actions without reason.
+    It also covered other actions that should be rejected as invalid.
+    Reported by Billy Crook.
+
+- General improvements:
+  - Privoxy can (re)compress buffered content before delivering
+    it to the client. Disabled by default as most users wouldn't
+    benefit from it.
+  - The +fast-redirects{check-decoded-url} action checks URL
+    segments separately. If there are other parameters behind
+    the redirect URL, this makes it unnecessary to cut them off
+    by additionally using a +redirect{} pcrs command.
+    Initial patch submitted by Jamie Zawinski in #3429848.
+  - When loading action sections, verify that the referenced filters
+    exist. Currently missing filters only result in an error message,
+    but eventually the severity will be upgraded to fatal.
+  - Allow to bind to multiple separate addresses.
+    Patch set submitted by Petr Pisar in #3354485.
+  - Set socket_error to errno if connecting fails in rfc2553_connect_to().
+    Previously rejected direct connections could be incorrectly reported
+    as DNS issues if Privoxy was compiled with IPv6 support.
+  - Adjust url_code_map[] so spaces are replaced with %20 instead of '+'
+    While '+' can be used by client's submitting form data, this is not
+    actually what Privoxy is using the lookups for. This is more of a
+    cosmetic issue and doesn't fix any known problems.
+  - When compiled without FEATURE_FAST_REDIRECTS, do not silently
+    ignore +fast-redirect{} directives
+  - Added a workaround for GNU libc's strptime() reporting negative
+    year values when the parsed year is only specified with two digits.
+    On affected systems cookies with such a date would not be turned
+    into session cookies by the +session-cookies-only action.
+    Reported by Vaeinoe in #3403560
+  - Fixed bind failures with certain GNU libc versions if no non-loopback
+    IP address has been configured on the system. This is mainly an issue
+    if the system is using DHCP and Privoxy is started before the network
+    is completely configured.
+    Reported by Raphael Marichez in #3349356.
+    Additional insight from Petr Pisar.
+  - Privoxy log messages now use the ISO 8601 date format %Y-%m-%d.
+    It's only slightly longer than the old format, but contains
+    the full date including the year and allows sorting by date
+    (when grepping in multiple log files) without hassle.
+  - In get_last_url(), do not bother trying to decode URLs that do
+    not contain at least one '%' sign. It reduces the log noise and
+    a number of unnecessary memory allocations.
+  - In case of SOCKS5 failures, dump the socks response in the log message.
+  - Simplify the signal setup in main().
+  - Streamline socks5_connect() slightly.
+  - In socks5_connect(), require a complete socks response from the server.
+    Previously Privoxy didn't care how much data the server response
+    contained as long as the first two bytes contained the expected
+    values. While at it, shrink the buffer size so Privoxy can't read
+    more than a whole socks response.
+  - In chat(), do not bother to generate a client request in case of
+    direct CONNECT requests. It will not be used anyway.
+  - Reduce server_last_modified()'s stack size.
+  - Shorten get_http_time() by using strftime().
+  - Constify the known_http_methods pointers in unknown_method().
+  - Constify the time_formats pointers in parse_header_time().
+  - Constify the formerly_valid_actions pointers in action_used_to_be_valid().
+  - Introduce a GNUMakefile MAN_PAGE variable that defaults to privoxy.1.
+    The Debian package uses section 8 for the man page and this
+    should simplify the patch.
+  - Deduplicate the INADDR_NONE definition for Solaris by moving it to jbsockets.h
+  - In block_url(), ditch the obsolete workaround for ancient Netscape versions
+    that supposedly couldn't properly deal with status code 403.
+  - Remove a useless NULL pointer check in load_trustfile().
+  - Remove two useless NULL pointer checks in load_one_re_filterfile().
+  - Change url_code_map[] from an array of pointers to an array of arrays
+    It removes an unnecessary layer of indirection and on 64bit system reduces
+    the size of the binary a bit.
+  - Fix various typos. Fixes taken from Debian's 29_typos.dpatch by Roland Rosenfeld.
+  - Add a dok-tidy GNUMakefile target to clean up the messy HTML
+    generated by the other dok targets.
+  - GNUisms in the GNUMakefile have been removed.
+  - Change the HTTP version in static responses to 1.1
+  - Synced config.sub and config.guess with upstream
+    2011-11-11/386c7218162c145f5f9e1ff7f558a3fbb66c37c5.
+  - Add a dedicated function to parse the values of toggles. Reduces duplicated
+    code in load_config() and provides better error handling. Invalid or missing
+    toggle values are now a fatal error instead of being silently ignored.
+  - Terminate HTML lines in static error messages with \n instead of \r\n.
+  - Simplify cgi_error_unknown() a bit.
+  - In LogPutString(), don't bother looking at pszText when not
+    actually logging anything.
+  - Change ssplit()'s fourth parameter from int to size_t.
+    Fixes a clang complaint.
+  - Add a warning that the statistics currently can't be trusted.
+    Mention Privoxy-Log-Parser's --statistics option as
+    an alternative for the time being.
+  - In rfc2553_connect_to(), start setting cgi->error_message on error.
+  - Change the expected status code returned for http://p.p/die depending
+    on whether or not FEATURE_GRACEFUL_TERMINATION is available.
+  - In cgi_die(), mark the client connection for closing.
+    If the client will fetch the style sheet through another connection
+    it gets the main thread out of the accept() state and should thus
+    trigger the actual shutdown.
+  - Add a proper CGI message for cgi_die().
+  - Don't enforce a logical line length limit in read_config_line().
+  - Slightly refactor server_last_modified() to remove useless gmtime*() calls.
+  - In get_content_type(), also recognize '.jpeg' as JPEG extension.
+  - Add '.png' to the list of recognized file extensions in get_content_type().
+  - In block_url(), consistently use the block reason "Request blocked by Privoxy"
+    In two places the reason was "Request for blocked URL" which hides the
+    fact that the request got blocked by Privoxy and isn't necessarily
+    correct as the block may be due to tags.
+  - In listen_loop(), reload the configuration files after accepting
+    a new connection instead of before.
+    Previously the first connection that arrived after a configuration
+    change would still be handled with the old configuration.
+  - In chat()'s receive-data loop, skip a client socket check if
+    the socket will be written to right away anyway. This can
+    increase the transfer speed for unfiltered content on fast
+    network connections.
+  - The socket timeout is used for SOCKS negotiations as well which
+    previously couldn't timeout.
+  - Don't keep the client connection alive if any configuration file
+    changed since the time the connection came in. This is closer to
+    Privoxy's behaviour before keep-alive support for client connection
+    has been added and also less confusing in general.
+  - Treat all Content-Type header values containing the pattern
+    'script' as a sign of text. Reported by pribog in #3134970.
+
+- Action file improvements:
+  - Moved the site-specific block pattern section below the one for the
+    generic patterns so for requests that are matched in both, the block
+    reason for the domain is shown which is usually more useful than showing
+    the one for the generic pattern.
+  - Remove -prevent-compression from the fragile alias. It's no longer
+    used anywhere by default and isn't known to break stuff anyway.
+  - Add a (disabled) section to block various Facebook tracking URLs.
+    Reported by Dan Stahlke in #3421764.
+  - Add a (disabled) section to rewrite and redirect click-tracking
+    URLs used on news.google.com.
+    Reported by Dan Stahlke in #3421755.
+  - Unblock linuxcounter.net/.
+    Reported by Dan Stahlke in #3422612.
+  - Block 'www91.intel.com/' which is used by Omniture.
+    Reported by Adam Piggott in #3167370.
+  - Disable the handle-as-empty-doc-returns-ok option and mark it as deprecated.
+    Reminded by tceverling in #2790091.
+  - Add ".ivwbox.de/" to the "Cross-site user tracking" section.
+    Reported by Nettozahler in #3172525.
+  - Unblock and fast-redirect ".awin1.com/.*=http://".
+    Reported by Adam Piggott in #3170921.
+  - Block "b.collective-media.net/".
+  - Widen the Debian popcon exception to "qa.debian.org/popcon".
+    Seen in Debian's 05_default_action.dpatch by Roland Rosenfeld.
+  - Block ".gemius.pl/" which only seems to be used for user tracking.
+    Reported by johnd16 in #3002731. Additional input from Lee and movax.
+  - Disable banners-by-size filters for '.thinkgeek.com/'.
+    The filter only seems to catch pictures of the inventory.
+  - Block requests for 'go.idmnet.bbelements.com/please/showit/'.
+    Reported by kacperdominik in #3372959.
+  - Unblock adainitiative.org/.
+  - Add a fast-redirects exception for '.googleusercontent.com/.*=cache'.
+  - Add a fast-redirects exception for webcache.googleusercontent.com/.
+  - Unblock http://adassier.wordpress.com/ and http://adassier.files.wordpress.com/.
+
+- Filter file improvements:
+  - Let the yahoo filter hide '.ads'.
+  - Let the msn filter hide overlay ads for Facebook 'likes' in search
+    results and elements with the id 's_notf_div'. They only seem to be
+    used to advertise site 'enhancements'.
+  - Let the js-events filter additionally disarm setInterval().
+    Suggested by dg1727 in #3423775.
+
+- Documentation improvements:
+  - Clarify the effect of compiling Privoxy with zlib support.
+    Suggested by dg1727 in #3423782.
+  - Point out that the SourceForge messaging system works like a black
+    hole and should thus not be used to contact individual developers.
+  - Mention some of the problems one can experience when not explicitly
+    configuring an IP addresses as listen address.
+  - Explicitly mention that hostnames can be used instead of IP addresses
+    for the listen-address, that only the first address returned will be
+    used and what happens if the address is invalid.
+    Requested by Calestyo in #3302213.
+
+- Log message improvements:
+  - If only the server connection is kept alive, do not pretend to
+    wait for a new client request.
+  - Remove a superfluous log message in forget_connection().
+  - In chat(), properly report missing server responses as such
+    instead of calling them empty.
+  - In forwarded_connect(), fix a log message nobody should ever see.
+  - Fix a log message in socks5_connect(), a failed write operation
+    was logged as failed read operation.
+  - Let load_one_actions_file() properly complain about a missing
+    '{' at the beginning of the file.
+    Simply stating that a line is invalid isn't particularly helpful.
+  - Do not claim to listen on a socket until Privoxy actually does.
+    Patch submitted by Petr Pisar #3354485
+  - Prevent a duplicated LOG_LEVEL_CLF message when sending out
+    the "no-server-data" response.
+  - Also log the client socket when dropping a connection.
+  - Include the destination host in the 'Request ... marked for
+    blocking. limit-connect{...} doesn't allow CONNECT ...' message
+    Patch submitted by Saperski in #3296250.
+  - Prevent a duplicated log message if none of the resolved IP
+    addresses were reachable.
+  - In connect_to(), do not pretend to retry if forwarded-connect-retries
+    is zero or unset.
+  - When a specified user or group can't be found, put the name in
+    single-quotes when logging it.
+  - In rfc2553_connect_to(), explain getnameinfo() errors better.
+  - Remove a useless log message in chat().
+  - When retrying to connect, also log the maximum number of connection
+    attempts.
+  - Rephrase a log message in compile_dynamic_pcrs_job_list().
+    Divide the error code and its meaning with a colon. Call the pcrs
+    job dynamic and not the filter. Filters may contain dynamic and
+    non-dynamic pcrs jobs at the same time. Only mention the name of
+    the filter or tagger, but don't claim it's a filter when it could
+    be a tagger.
+  - In a fatal error message in load_one_actions_file(), cover both
+    URL and TAG patterns.
+  - In pcrs_strerror(), properly report unknown positive error code
+    values as such. Previously they were handled like 0 (no error).
+  - In compile_dynamic_pcrs_job_list(), also log the actual error code as
+    pcrs_strerror() doesn't handle all errors reported by pcre.
+  - Don't bother trying to continue chatting if the client didn't ask for it.
+    Reduces log noise a bit.
+  - Make two fatal error message in load_one_actions_file() more descriptive.
+  - In cgi_send_user_manual(), log when rejecting a file name due to '/' or '..'.
+  - In load_file(), log a message if opening a file failed.
+    The CGI error message alone isn't too helpful.
+  - In connection_destination_matches(), improve two log messages
+    to help understand why the destinations don't match.
+  - Rephrase a log message in serve(). Client request arrival
+    should be differentiated from closed client connections now.
+  - In serve(), log if a client connection isn't reused due to a
+    configuration file change.
+  - Let mark_server_socket_tainted() always mark the server socket tainted,
+    just don't talk about it in cases where it has no effect. It doesn't change
+    Privoxy's behaviour, but makes understanding the log file easier.
+
+- configure:
+  - Added a --disable-ipv6-support switch for platforms where support
+    is detected but doesn't actually work.
+  - Do not check for the existence of strerror() and memmove() twice
+  - Remove a useless test for setpgrp(2). Privoxy doesn't need it and
+    it can cause problems when cross-compiling.
+  - Rename the --disable-acl-files switch to --disable-acl-support.
+    Since about 2001, ACL directives are specified in the standard
+    config file.
+  - Update the URL of the 'Removing outdated PCRE version after the
+    next stable release' posting. The old URL stopped working after
+    one of SF's recent site "optimizations". Reported by Han Liu.
+
+- Privoxy-Regression-Test:
+  - Added --shuffle-tests option to increase the chances of detection race conditions.
+  - Added a --local-test-file option that allows to use Privoxy-Regression-Test without Privoxy.
+  - Added tests for missing socks4 and socks4a forwarders.
+  - The --privoxy-address option now works with IPv6 addresses containing brackets, too.
+  - Perform limited sanity checks for parameters that are supposed to have numerical values.
+  - Added a --sleep-time option to specify a number of seconds to
+    sleep between tests, defaults to 0.
+  - Disable the range-requests tagger for tests that break if it's enabled.
+  - Log messages use the ISO 8601 date format %Y-%m-%d.
+  - Fix spelling in two error messages.
+  - In the --help output, include a list of supported tests and their default levels.
+  - Adjust the tests to properly deal with FEATURE_TOGGLE being disabled.
+
+- Privoxy-Log-Parser:
+  - Perform limited sanity checks for command line parameters that
+    are supposed to have numerical values.
+  - Implement a --unbreak-lines-only option to try to revert MUA breakage.
+  - Accept and highlight: Added header: Content-Encoding: deflate
+  - Accept and highlight: Compressed content from 29258 to 8630 bytes.
+  - Accept and highlight: Client request arrived in time on socket 21.
+  - Highlight: Didn't receive data in time: a.fsdn.com:443
+  - Accept log messages with ISO 8601 time stamps, too.
+
+- uagen:
+  - Bump generated Firefox version to 8.0.
+  - Only randomize the release date if the new --randomize-release-date
+    option is enabled. Firefox versions after 4 use a fixed date string
+    without meaning.
+
+*** Version 3.0.17 Stable ***
+
+- Fixed last-chunk-detection for responses where the body was small
+  enough to be read with the headers, causing Privoxy to wait for the
+  end of the content until the server closed the connection or the
+  request timed out. Reported by "Karsten" in #3028326.
+- Responses with status code 204 weren't properly detected as body-less
+  like RFC2616 mandates. Like the previous bug, this caused Privoxy to
+  wait for the end of the content until the server closed the connection
+  or the request timed out. Fixes #3022042 and #3025553, reported by a
+  user with no visible name. Most likely also fixes a bunch of other
+  AJAX-related problem reports that got closed in the past due to
+  insufficient information and lack of feedback.
+- Fixed an ACL bug that made it impossible to build a blacklist.
+  Usually the ACL directives are used in a whitelist, which worked
+  as expected, but blacklisting is still useful for public proxies
+  where one only needs to deny known abusers access.
+- Added LOG_LEVEL_RECEIVED to log the not-yet-parsed data read from the
+  network. This should make debugging various parsing issues a lot easier.
+- The IPv6 code is enabled by default on Windows versions that support it.
+  Patch submitted by oCameLo in #2942729.
+- In mingw32 versions, the user.filter file is reachable through the
+  GUI, just like default.filter is. Feature request 3040263.
+- Added the configure option --enable-large-file-support to set a few
+  defines that are required by platforms like GNU/Linux to support files
+  larger then 2GB. Mainly interesting for users without proper logfile
+  management.
+- Logging with "debug 16" no longer stops at the first nul byte which is
+  pretty useless. Non-printable characters are replaced with their hex value
+  so the result can't span multiple lines making parsing them harder then
+  necessary.
+- Privoxy logs when reading an action, filter or trust file.
+- Fixed incorrect regression test markup which caused a test in
+  3.0.16 to fail while Privoxy itself was working correctly.
+  While Privoxy accepts hide-referer, too, the action name is actually
+  hide-referrer which is also the name used one the final results page,
+  where the test expected the alias.
+
+- CGI interface improvements:
+  - In finish_http_response(), continue to add the 'Connection: close'
+    header if the client connection will not be kept alive.
+    Anonymously pointed out in #2987454.
+  - Apostrophes in block messages no longer cause parse errors
+    when the blocked page is viewed with JavaScript enabled.
+    Reported by dg1727 in #3062296.
+  - Fix a bunch of anchors that used underscores instead of dashes.
+  - Allow to keep the client connection alive after crunching the previous request.
+    Already opened server connections can be kept alive, too.
+  - In cgi_show_url_info(), don't forget to prefix URLs that only contain
+    http:// or https:// in the path. Fixes #2975765 reported by Adam Piggott.
+  - Show the 404 CGI page if cgi_send_user_manual() is called while
+    local user manual delivery is disabled.
+
+- Action file improvements:
+  - Enable user.filter by default. Suggested by David White in #3001830.
+  - Block .sitestat.com/. Reported by johnd16 in #3002725.
+  - Block .atemda.com/. Reported by johnd16 in #3002723.
+  - Block js.adlink.net/. Reported by johnd16 in #3002720.
+  - Block .analytics.yahoo.com/. Reported by johnd16 in #3002713.
+  - Block sb.scorecardresearch.com, too. Reported by dg1727 in #2992652.
+  - Fix problems noticed on Yahoo mail and news pages.
+  - Remove the too broad yahoo section, only keeping the
+    fast-redirects exception as discussed on ijbswa-devel@.
+  - Don't block adesklets.sourceforge.net. Reported in #2974204.
+  - Block chartbeat ping tracking. Reported in #2975895.
+  - Tag CSS and image requests with cautious and medium settings, too.
+  - Don't handle view.atdmt.com as image. It's used for click-throughs
+    so users should be able to "go there anyway".
+    Reported by Adam Piggott in #2975927.
+  - Also let the refresh-tags filter remove invalid refresh tags where
+    the 'url=' part is missing. Anonymously reported in #2986382.
+    While at it, update the description to mention the fact that only
+    refresh tags with refresh times above 9 seconds are covered.
+  - javascript needs to be blocked with +handle-as-empty-document to
+    work around Firefox bug 492459.  So move .js blockers from
+    +block{Might be a web-bug.} -handle-as-empty-document to
+    +block{Might be a web-bug.} +handle-as-empty-document.
+  - ijbswa-Feature Requests-3006719 - Block 160x578 Banners.
+  - Block another omniture tracking domain.
+  - Added a range-requests tagger.
+  - Added two sections to get Flickr's Ajax interface working with
+    default pre-settings. If you change the configuration to block
+    cookies by default, you'll need additional exceptions.
+    Reported by Mathias Homann in #3101419 and by Patrick on ijbswa-users@.
+
+- Documentation improvements:
+  - Explicitly mention how to match all URLs.
+  - Consistently recommend socks5 in the Tor FAQ entry and mention
+    its advantage compared to socks4a. Reported by David in #2960129.
+  - Slightly improve the explanation of why filtering may appear
+    slower than it is.
+  - Grammar fixes for the ACL section.
+  - Fixed a link to the 'intercepting' entry and add another one.
+  - Rename the 'Other' section to 'Mailing Lists' and reword it
+    to make it clear that nobody is forced to use the trackers
+  - Note that 'anonymously' posting on the trackers may not always
+    be possible.
+  - Suggest to enable debug 32768 when suspecting parsing problems.
+
+- Privoxy-Log-Parser improvements:
+  - Gather statistics for ressources, methods, and HTTP versions
+    used by the client.
+  - Also gather statistics for blocked and redirected requests.
+  - Provide the percentage of keep-alive offers the client accepted.
+  - Add a --url-statistics-threshold option.
+  - Add a --host-statistics-threshold option to also gather
+    statistics about how many request where made per host.
+  - Fix a bug in handle_loglevel_header() where a 'scan: ' got lost.
+  - Add a --shorten-thread-ids option to replace the thread id with
+    a decimal number.
+  - Accept and ignore: Looks like we got the last chunk together
+    with the server headers. We better stop reading.
+  - Accept and ignore: Continue hack in da house.
+  - Accept and higlight: Rejecting connection from 10.0.0.2.
+    Maximum number of connections reached.
+  - Accept and highlight: Loading actions file: /usr/local/etc/privoxy/default.action
+  - Accept and highlight: Loading filter file: /usr/local/etc/privoxy/default.filter
+  - Accept and highlight: Killed all-caps Host header line: HOST: bestproxydb.com
+  - Accept and highlight: Reducing expected bytes to 0. Marking
+    the server socket tainted after throwing 4 bytes away.
+  - Accept: Merged multiple header lines to: 'X-FORWARDED-PROTO: http X-HOST: 127.0.0.1'
+
+- Code cleanups:
+  - Remove the next member from the client_state struct. Only the main
+    thread needs access to all client states so give it its own struct.
+  - Garbage-collect request_contains_null_bytes().
+  - Ditch redundant code in unload_configfile().
+  - Ditch LogGetURLUnderCursor() which doesn't seem to be used anywhere.
+  - In write_socket(), remove the write-only variable write_len in
+    an ifdef __OS2__ block. Spotted by cppcheck.
+  - In connect_to(), don't declare the variable 'flags' on OS/2 where
+    it isn't used. Spotted by cppcheck.
+  - Limit the scope of various variables. Spotted by cppcheck.
+  - In add_to_iob(), turn an interestingly looking for loop into a
+    boring while loop.
+  - Code cleanup in preparation for external filters.
+  - In listen_loop(), mention the socket on which we accepted the
+    connection, not just the source IP address.
+  - In write_socket(), also log the socket we're writing to.
+  - In log_error(), assert that escaped characters get logged
+    completely or not at all.
+  - 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
+    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
+    to http_response.crunch_reason.
+  - Silence a 'gcc (Debian 4.3.2-1.1) 4.3.2' warning on i686 GNU/Linux.
+  - Fix white-space in a log message in remove_chunked_transfer_coding().
+    While at it, add a note that the message doesn't seem to
+    be entirely correct and should be improved later on.
+
+- GNUmakefile improvements:
+  - Use $(SSH) instead of ssh, so one only needs to specify a username once.
+  - Removed references to the action feedback thingy that hasn't been
+    working for years.
+  - Consistently use shell.sourceforge.net instead of shell.sf.net so
+    one doesn't need to check server fingerprints twice.
+  - Removed GNUisms in the webserver and webactions targets so they
+    work with standard tar.
+
+*** Version 3.0.16 Stable ***
+
+- Added the config file option handle-as-empty-doc-returns-ok to
+  work around Firefox bug #492459, which causes Firefox to hang
+  if JavaScripts are blocked in certain situations. The option is
+  enabled in the default config file.
+- Added the config file option default-server-timeout to control the
+  assumed default server timeout. Since Privoxy no longer returns
+  an error message for connection resets on reused client connections,
+  assuming larger server timeout values appears to actually work
+  pretty well as long as connections aren't shared.
+- Added optional support for FreeBSD's accf_http(9). Use the
+  configure option --enable-accept-filter to enable it.
+- Added fancier Privoxy icons for win32. Contributed by Jeff H.
+- In daemon mode, fd 0, 1 and 2 are bound to /dev/null.
+- Resolve localhost using whatever address family the operating
+  system feels like. Previous betas would try to use IPv4 as this
+  is what most users expect, but this didn't work reliably on
+  GNU/Linux systems.
+- In the action lists on CGI pages, actions and their parameters are
+  no longer separated with a space. The action file parser doesn't
+  actually allow this and will throw an invalid syntax error if actions
+  and parameters in the action files are separated. Not adding the
+  spaces means copy and pasting CGI output into the action files works.
+- The default keep-alive timeout has been reduced to 5 seconds to work
+  around hangs in clients that treat the proxy like any other host and
+  stop allowing any new connections if the "maximum number of
+  connections per host" is reached.
+- Several webbug URLs that look like they are leading to images are now
+  blocked as image instead of empty documents. Doing the latter causes
+  WebKit-based clients to show a "missing image" icon which may mess up
+  the layout.
+- The no-such-domain template is used for DNS resolution
+  problems with FEATURE_IPV6_SUPPORT enabled. Previously the
+  connect-failed template was used. Reported by 'zebul666'.
+- Accepts quoted expiration dates even though RFC 2109 10.1.2
+  doesn't seem to allow them. Reported anonymously.
+- Don't try to forget connections if connection sharing is disabled.
+  This wasn't a real problem but caused an unnecessary log message.
+- The still undocumented --enable-extended-host-patterns configure
+  option has a better description.
+- Fixed an error message that would claim a write to the server
+  failed when actually writing to the client failed.
+- Log the crunch reason before trying to write to the client.
+  The log is easier to read that way.
+- Several log messages about client connections also mention
+  the socket number.
+- handle-as-empty-document no longer depends on the image blocking
+  code being enabled.
+- Privoxy-Log-Parser is roughly 40% faster in highlighting mode.
+- uagen, a Firefox User-Agent generator for Privoxy and Mozilla
+  browsers has been imported and is available in the tarball's
+  tools directory.
+- The scripts in the tools directory treat unknown parameters
+  as fatal errors.
+
+*** Version 3.0.15 Beta ***
+
+- In case of missing server data, no error message is send to the
+  client if the request arrived on a reused connection. The client
+  is then supposed to silently retry the request without bothering
+  the user. This should significantly reduce the frequency of the
+  "No server or forwarder data received" error message many users
+  reported.
+- More reliable detection of prematurely closed client sockets
+  with keep-alive enabled.
+- FEATURE_CONNECTION_KEEP_ALIVE is decoupled from
+  FEATURE_CONNECTION_SHARING and now available on
+  all platforms.
+- Improved handling of POST requests on reused connections.
+  Should fix problems with stalled connections after submitting
+  form data with some browser configurations.
+- Fixed various latency calculation issues.
+- Allows the client to pass NTLM authentication requests to a
+  forwarding proxy. This was already assumed and hinted to work
+  in 3.0.13 beta but actually didn't. Now it's confirmed to work
+  with IE, Firefox and Chrome.
+  Thanks to Francois Botha and Wan-Teh Chang
+- Fixed a calculation problem if receiving the server headers
+  takes more than two reads, that could cause Privoxy to terminate
+  the connection prematurely. Reported by Oliver.
+- Compiles again on platforms such as OpenBSD and systems
+  using earlier glibc version that don't support AI_ADDRCONFIG.
+  Anonymously submitted in #2872591.
+- A bunch of MS VC project files and Suse and Redhat RPM spec
+  files have been removed as they were no longer maintained for
+  quite some time.
+- Overly long action lines are properly rejected with a proper
+  error message. Previously they would be either rejected as
+  invalid or cause a core dump through abort().
+- Already timed-out connections are no longer temporarily remembered.
+  They weren't reused anyway, but wasted a socket slot.
+- len refers to the number of bytes actually read which might
+  differ from the ones received. Adjust log messages accordingly.
+- The optional JavaScript on the CGI page uses encodeURIComponent()
+  instead of escape() which doesn't encode all characters that matter.
+  Anonymously reported in #2832722.
+- Fix gcc45 warnings in decompress_iob().
+- Various log message improvements.
+- Privoxy-Regression-Test supports redirect tests.
+- Privoxy-Log-Parser can gather some connection statistics.
+
+*** Version 3.0.14 Beta ***
+
+- The latency is taken into account when evaluating whether or not to
+  reuse a connection. This should significantly reduce the number of
+  connections problems several users reported.
+- If the server doesn't specify how long the connection stays alive,
+  Privoxy errs on the safe side of caution and assumes it's only a second.
+- The error pages for connection timeouts or missing server data use a
+  Last-Modified date in the past. Retry attempts are detected and Privoxy
+  removes the If-Modified-Since header to prevent the server from responding
+  with status code 304 in which case the client would reuse the error message.
+- Setting keep-alive-timeout to 0 disables keep-alive support. Previously
+  Privoxy would claim to allow persistence but not reuse the connection.
+- Pipelined requests are less likely to be mistaken for the request
+  body of the previous request. Note that Privoxy still has no real
+  pipeline support and will either serialize pipelined requests or
+  drop them in which case the client has to resent them.
+- Fixed a crash on some Windows versions when header randomization
+  is enabled and the date couldn't be parsed.
+- Privoxy's keep-alive timeout for the current connection is reduced
+  to the one specified in the client's Keep-Alive header.
+- For HTTP/1.1 requests, Privoxy implies keep-alive support by not
+  setting any Connection header instead of using 'Connection: keep-alive'.
+- If the socket isn't reusable, Privoxy doesn't temporarily waste
+  a socket slot to remember the connection.
+- If keep-alive support is disabled but compiled in, the client's
+  Keep-Alive header is removed.
+- Fixed a bug on mingw32 where downloading large files failed if
+  keep-alive support was enabled.
+- Fixed a bug that (at least theoretically) could cause log
+  timestamps to be occasionally off by about a second.
+- No Proxy-Connection header if added if there already is one.
+- The configure script respects the $PATH variable when searching
+  for groups and id.
+
+*** Version 3.0.13 Beta ***
+
+- Added IPv6 support. Thanks to Petr Pisar who not only provided
+  the initial patch but also helped a lot with the integration.
+- Added client-side keep-alive support.
+- The connection sharing code is only used if the connection-sharing
+  option is enabled.
+- The max-client-connections option has been added to restrict
+  the number of client connections below a value enforced by
+  the operating system.
+- Fixed a regression reintroduced in 3.0.12 that could cause
+  crashes on mingw32 if header date randomization was enabled.
+- Compressed content with extra fields couldn't be decompressed
+  and would get passed to the client unfiltered. This problem
+  has only be detected through statical analysis with clang as
+  nobody seems to be using extra fields anyway.
+- If the server resets the Connection after sending only the headers
+  Privoxy forwards what it got to the client. Previously Privoxy
+  would deliver an error message instead.
+- Error messages in case of connection timeouts use the right
+  HTTP status code.
+- If spawning a child to handle a request fails, the client
+  gets an error message and Privoxy continues to listen for
+  new requests right away.
+- The error messages in case of server-connection timeouts or
+  prematurely closed server connections are now template-based.
+- If zlib support isn't compiled in, Privoxy no longer tries to
+  filter compressed content unless explicitly asked to do so.
+- In case of connections that are denied based on ACL directives,
+  the memory used for the client IP is no longer leaked.
+- Fixed another small memory leak if the client request times out
+  while waiting for client headers other than the request line.
+- The client socket is kept open until the server socket has
+  been marked as unused. This should increase the chances that
+  the still-open connection will be reused for the client's next
+  request to the same destination. Note that this only matters
+  if connection-sharing is enabled.
+- A TODO list has been added to the source tarball to give potential
+  volunteers a better idea of what the current goals are. Donations
+  are still welcome too: http://www.privoxy.org/faq/general.html#DONATE
+
+*** Version 3.0.12 ***
+
+- The socket-timeout option now also works on platforms whose
+  select() implementation modifies the timeout structure.
+  Previously the timeout was triggered even if the connection
+  didn't stall. Reported by cyberpatrol.
+- The Connection: keep-alive code properly deals with files
+  larger than 2GB. Previously the connection was closed too
+  early.
+- The content length for files above 2GB is logged correctly.
+- The user-manual directive on the show-status page links to
+  the documentation location specified with the directive,
+  not to the Privoxy website.
+- When running in daemon mode, Privoxy doesn't log anything
+  to the console unless there are errors before the logfile
+  has been opened.
+- The show-status page prints warnings about invalid directives
+  on the same line as the directives themselves.
+- Fixed several justified (but harmless) compiler warnings,
+  mostly on 64 bit platforms.
+- The mingw32 version explicitly requests the default charset
+  to prevent display problems with some fonts available on more
+  recent Windows versions. Patch by Burberry.
+- The mingw32 version uses the Privoxy icon in the alt-tab
+  windows. Patch by Burberry.
+- The timestamp and the thread id is omitted in the "Fatal error"
+  message box on mingw32.
+- Fixed two related mingw32-only buffer overflows. Triggering
+  them required control over the configuration file, therefore
+  this isn't seen as a security issue.
+- In verbose mode, or if the new option --show-skipped-tests
+  is used, Privoxy-Regression-Test logs skipped tests and the
+  skip reason.
+
+*** Version 3.0.11 ***
+
+- On most platforms, outgoing connections can be kept alive and
+  reused if the server supports it. Whether or not this improves
+  things depends on the connection.
+- When dropping privileges, membership in supplementary groups
+  is given up as well. Not doing that can lead to Privoxy running
+  with more rights than necessary and violates the principle of
+  least privilege. Users of the --user option are advised to update.
+  Thanks to Matthias Drochner for reporting the problem,
+  providing the initial patch and testing the final version.
+- Passing invalid users or groups with the --user option
+  didn't lead to program exit. Regression introduced in 3.0.7.
+- The match all section has been moved from default.action
+  to a new file called match-all.action. As a result the
+  default.action no longer needs to be touched by the user
+  and can be safely overwritten by updates.
+- The standard.action file has been removed. Its content
+  is now part of the default.action file.
+- In some situations the logged content length was slightly too low.
+- Crunched requests are logged with their own log level.
+  If you used "debug 1" in the past, you'll probably want
+  to additionally enable "debug 1024", otherwise only passed
+  requests will be logged. If you only care about crunched
+  requests, simply replace "debug 1" with "debug 1024".
+- The crunch reason has been moved to the beginning of the
+  crunch message. For HTTP URLs, the protocol is logged as well.
+- Log messages are shortened by printing the thread id on its
+  own (as opposed to putting it inside the string "Privoxy()").
+- The config option socket-timeout has been added to control
+  the time Privoxy waits for data to arrive on a socket.
+- Support for remote toggling is controlled by the configure
+  option --disable-toggle only. In previous versions it also
+  depended on the action editor and thus configuring with the
+  --disable-editor option would disable remote toggling support
+  as well.
+- Requests with invalid HTTP versions are rejected.
+- The template symbol @date@ can be used to include a date(1)-like
+  time string. Initial patch submitted by Endre Szabo.
+- Responses from shoutcast servers are accepted again.
+  Problem reported and fix suggested by Stefan.
+- The hide-forwarded-for-headers action has been replaced with
+  the change-x-forwarded-for{} action which can also be used to
+  add X-Forwarded-For headers. The latter functionality already
+  existed in Privoxy versions prior to 3.0.7 but has been removed
+  as it was often used unintentionally (by not using the
+  hide-forwarded-for-headers action).
+- A "clear log" view option was added to the mingw32 version
+  to clear out all of the lines in the Privoxy log window.
+  Based on a patch submitted by T Ford.
+- The mingw32 version uses "critical sections" now, which prevents
+  log message corruption under load. As a side effect, the
+  "no thread-safe PRNG" warning could be removed as well.
+- The mingw32 version's task bar icon is crossed out and
+  the color changed to gray if Privoxy is toggled off.
+
+*** Version 3.0.10 ***
+
+- Ordinary configuration file changes no longer cause program
+  termination on OS/2 if the name of the logfile hasn't been
+  changed as well. This regression probably crept in with the
+  logging improvements in 3.0.7. Reported by Maynard.
+- The img-reorder filter is less likely to mess up JavaScript code in
+  img tags. Problem and solution reported by Glenn Washburn in #2014552.
+- The source tar ball now includes Privoxy-Log-Parser,
+  a syntax-highlighter for Privoxy logs. For fancy screenshots see:
+  http://www.fabiankeil.de/sourcecode/privoxy-log-parser/
+  Documentation is available through perldoc(1).
+
+*** Version 3.0.9 Beta ***
+
+- Added SOCKS5 support (with address resolution done by
+  the SOCKS5 server). Patch provided by Eric M. Hopper.
 - The "blocked" CGI pages include a block reason that was
   provided as argument to the last-applying block action.
 - If enable-edit-actions is disabled (the default since 3.0.7 beta)
@@ -23,6 +1179,18 @@ ChangeLog for Privoxy
 - Action settings for multiple patterns in the same section are
   shared in memory. As a result these sections take up less space
   (and are loaded slightly faster). Problem reported by Franz Schwartau.
+- Linear white space in HTTP headers will be normalized to single
+  spaces before parsing the header's content, headers split across
+  multiple lines get merged first. This should prevent problems like:
+   * letting the session-cookies-only action slip
+     some Cookies through unmodified,
+   * only suppressing the first line of a header,
+     thus creating an invalid one, and
+   * to incorrectly block headers with valid timestamps
+     that weren't properly recognized.
+  Headers that could trigger these problems are unlikely to appear
+  in "normal" web traffic, but could be intentionally generated to
+  fool some of Privoxy's header parsers.
 - Host information is gathered outside the main thread so it's less
   likely to delay other incoming connections if the host is misconfigured.
 - New config option "hostname" to use a hostname other than
@@ -37,10 +1205,34 @@ ChangeLog for Privoxy
   "Content-Type: application/x-shockwave-flash" headers up.
 - In the show-url-info page's "Final results" section active and
   inactive actions are listed separately. Patch provided by Lee.
+- The GNUmakefile supports the DESTDIR variable. Patch for
+  the install target submitted by Radoslaw Zielinski.
+- Embedding the content of configuration files in the show-status
+  page is significantly faster now. For a largish action file (1 MB)
+  a speedup of about 2450 times has been measured. This is mostly
+  interesting if you are using large action files or regularly use
+  Privoxy-Regression-Test while running Privoxy through Valgrind,
+  for stock configuration files it doesn't really matter.
+- If zlib support is unavailable and there are content
+  filters active but the prevent-compression action is disabled,
+  the show-url-info page includes a warning that compression
+  might prevent filtering.
+- The show-url-info page provides an OpenSearch Description that
+  allows to access the page through browser search plugins.
+- Custom client-header filters that rewrite the request line
+  incorrectly no longer cause Privoxy to crash. Reported by din_a4.
 - The obsolete kill-popups action has been removed as the
-  PCRS-based popup filters can do the same and are less
-  unreliable.
+  PCRS-based popup filters can do the same and are slightly
+  less unreliable.
 - The inspect-jpegs action has been removed.
+- The send-wafer and send-vanilla-wafer actions have been removed.
+  They weren't particular useful and their behaviour could be emulated
+  with add-header anyway.
+- Privoxy-Regression-Test has been significantly improved.
+- Most sections in the default.action file contain tests for
+  Privoxy-Regression-Test to verify that they are working as intended.
+- Parts of Privoxy have been refactored to increase maintainability.
+- Building with zlib (if available) is done by default.
 
 *** Version 3.0.8 ***
 
@@ -111,7 +1303,7 @@ ChangeLog for Privoxy
   forbidden characters like dots.
 - New trust entries are saved with a comment that contains the
   trusted referring URL (Suggested by Daniel Griscom).
-- Filter descriptions are HTML encoded automatically. 	
+- Filter descriptions are HTML encoded automatically.
 - New config option "split-large-forms" to work
   around a browser bug that caused IE6 and IE7 to ignore
   the Submit button on the edit-actions-for-url CGI page.
@@ -150,11 +1342,11 @@ ChangeLog for Privoxy
   Privoxy detection "attack". Note that detecting Privoxy is
   still possible through other ways and Privoxy was never intended
   to be invisible anyway.
-- Added support for AmigaOS 4, fixed build for AmigaOS 3.x.	
+- Added support for AmigaOS 4, fixed build for AmigaOS 3.x.
 - The show-url-info CGI page displays a warning if Privoxy
   is currently toggled off.
 - The show-status CGI page suppresses the edit button
-  for action files if Privoxy has no write access.	
+  for action files if Privoxy has no write access.
 - Most CGI error pages react properly to HEAD requests.
 - Requests with RFC 3253 HTTP methods (used by Subversion)
   are accepted. (Patch provided by Petr Kadlec)
@@ -229,18 +1421,18 @@ ChangeLog for Privoxy
 - Improved the filters img-reorder, js-annoyances, webbugs,
   banners-by-size, banners-by-link and ie-exploits to make them
   less likely to break anything.
-- Removed outdated URL patterns in default.action and added new ones. 
+- Removed outdated URL patterns in default.action and added new ones.
 - Added redirection from http://p.p/user-manual to http://p.p/user-manual/
 - Changed webinterface default values for hide-user-agent, hide-referrer
   and set-image-blocker.
-	
+
 *** Version 3.0.5 Beta ***
 
 - Windows version can be installed/started as a service.
 - Windows icon stays blue when Privoxy is idle, green when busy.
 - Integrated Fabian Keil's extensive patch.  See:
-  http://www.fabiankeil.de/sourcecode/privoxy/. Includes the 
-  following new or significantly improved actions (among many 
+  http://www.fabiankeil.de/sourcecode/privoxy/. Includes the
+  following new or significantly improved actions (among many
   other improvements):
 
      content-type-overwrite{}
@@ -268,17 +1460,17 @@ ChangeLog for Privoxy
 - Added jpeg filtering to defend against MS jpeg vulnerability MS04-028
   with the new inspect-jpegs action.
 - Removed the "arbitrary" 1000 filter limit - addresses tracker #911950
-- Thanks to Jindrich Makovicka for a race condition fix for the log 
+- Thanks to Jindrich Makovicka for a race condition fix for the log
   file.  The race condition remains for non-pthread implementations.
   Reference patch #1175720. Various other logging enhancements.
 - A pile of assorted bug fixes, memory leaks, enhancements, etc.
 - Moved Actions file reporting mechanism to SF tracker.
-- Two new options for config: enable-remote-http-toggle and 
+- Two new options for config: enable-remote-http-toggle and
   forwarded-connect-retries.
 - Trap unsupported FTP requests.
 - Let text/xml be filtered.
 - Numerous updates to default.action
-- Increase the compiled in limit of trusted referrers from 64 to 512 
+- Increase the compiled in limit of trusted referrers from 64 to 512
   (for trustfile users).
 
 *** Version 3.0.3 ***
@@ -295,15 +1487,15 @@ ChangeLog for Privoxy
 - Workarounds for client (iTunes etc) and server (PHP < 4.2.3) bugs
   including the notorious "blank page" problem.
 - Various filter improvements; most notably the unsolicited-popups
-  filter became less destructive     
+  filter became less destructive
 - Major revamp of the actions file
-	
+
 *** Version 3.0.2 ***
 
 - Fixed two memory leaks, one serious
 - Fixed bug in pcrs which could cause crashes with user-defined filters
 - Fixed bug in domain name matching
-- Assorted small fixes (Win32 menu, CGI URL editor, ..) 
+- Assorted small fixes (Win32 menu, CGI URL editor, ..)
 - Added basic support for the OPTIONS and TRACE http methods
 - Added workaround for Bug in Mac OSX that made Privoxy crash occasionally
 - Refined the default action file through >400 items of user feedback
@@ -314,7 +1506,7 @@ ChangeLog for Privoxy
   - Replaced filter "popups" by choice between two modes:
     - "unsolicited-popups" tries to catch only the unsolicited ones
     - "all-popups" tries to kill them all (as before)
-  - New filter "tiny-textforms" Help those tiny or hard-wrap textareas. 
+  - New filter "tiny-textforms" Help those tiny or hard-wrap textareas.
   - New filter "jumping-windows" that prevents windows from resizing
     and moving themselves
   - New filter "demoronizer" which fixes MS's abuse of std charsets
@@ -338,7 +1530,7 @@ ChangeLog for Privoxy
 - Added quicktime-kioskmode filter and improved frameset-borders
 - Updated default.action based on latest feedback
 - New PDF doc build process
-- Add a user contrib module to cvs: 
+- Add a user contrib module to cvs:
   http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ijbswa/contrib/
 
 *** Version 2.9.18  ***
@@ -348,7 +1540,7 @@ ChangeLog for Privoxy
 - Three filters fixed (again!)
 - Assorted small fixes and doc enhancements
 
-*** Version 2.9.16  *** 
+*** Version 2.9.16  ***
 
 - Major revamp of default.action to get rid of years of cruft.
 - Same for default.filter
@@ -360,11 +1552,11 @@ ChangeLog for Privoxy
 - user-manual directive added to config for help links from within CGI
   editor.
 - Multiple actions files can now be specified in config.
-- Actions files are changed to: default.action, standard.action, and 
+- Actions files are changed to: default.action, standard.action, and
   user.action. user.action is for personal/local configuration.
 - The usual many small and miscellaneous bug and security fixes.
 
-*** Version 2.9.14 Beta *** 
+*** Version 2.9.14 Beta ***
 
 - Fix Solaris compile problem (gateway.h and filters.h)
 - Makefile fixes for Solaris, FreeBSD (?)
@@ -378,30 +1570,30 @@ ChangeLog for Privoxy
 - #include mechansim for common text in templates
 - Various other minor fixes.
 
-*** Version 2.9.13 Beta *** 
+*** Version 2.9.13 Beta ***
 
-- *NEWS*: The project has been renamed to Privoxy! The new name is 
+- *NEWS*: The project has been renamed to Privoxy! The new name is
   reflected throughout (file locations, etc).
-- ijb.action is now default.action. re_filterfile is now 
+- ijb.action is now default.action. re_filterfile is now
   default.filter.
 - http://i.j.b/ is now http://p.p/
-- The 'logo' option for replacing ad iamges is removed now. 'Pattern' 
+- The 'logo' option for replacing ad iamges is removed now. 'Pattern'
   (checkerboard) is now the default.
 - RPM spec file make over.
 
 
-*** Version 2.9.12 Beta *** 
+*** Version 2.9.12 Beta ***
 
-- **READ**: The default listening PORT is NOW 8118!!! Changed from 
-  8000 due to conflict with NAS (Network Audio Server, whatever that 
+- **READ**: The default listening PORT is NOW 8118!!! Changed from
+  8000 due to conflict with NAS (Network Audio Server, whatever that
   is.)
 - More CGI actions editor fixes and improvements.
 - Win32 command line fix ups.
-- re_filterfile now has modular sections that can be activated on a 
+- re_filterfile now has modular sections that can be activated on a
   per site basis. Some new goodies there too.
 - +filter now takes arguments to match FILTER sections in re_filterfile
-  for even more flexibility. 
-- Added a new image blocker option: +image-blocker{pattern}, which 
+  for even more flexibility.
+- Added a new image blocker option: +image-blocker{pattern}, which
   displays a checkerboard patthern and scales better than the logo.
 - PNG images will be used in place of GIF for JB built-in images
   if configured with --enable-no-gif.
@@ -414,14 +1606,14 @@ ChangeLog for Privoxy
 - CGI Editor works on OS/2 now.
 - Fix restart failure where sockets were in TIME_WAIT.
 - Fixes for actions cgi editor, make sure we have right file.
-- A --pidfile command line option now, in addition to --help, 
+- A --pidfile command line option now, in addition to --help,
   --version, --no-daemon, --user and configfile. --no-daemon replaces
-  the former -d option and _DEBUG define. --user will drop privileges 
+  the former -d option and _DEBUG define. --user will drop privileges
   to the specified user.
 - Signal handling cleanups (*nix).
 - CGI actions editor improvements and fixes.
 - Error handling improvements, especially out of memory.
-- Default re_filterfile fix that caused spurious IJB logos 
+- Default re_filterfile fix that caused spurious IJB logos
   (instead of 'blank').
 - configure.in threading fixes for Solaris.
 - Various other minor fixes.
@@ -429,14 +1621,14 @@ ChangeLog for Privoxy
 
 *** Version 2.9.11 Beta Changes ***
 
-- Add "session" cookie concept where cookies exist for the life 
-of that browser session only (ie never goes to disk). 
+- Add "session" cookie concept where cookies exist for the life
+  of that browser session only (ie never goes to disk).
 - Checks for correct header length.
 - Fix user:pass@host.domain.com auth bug.
 - Better signal handling on *nix.
 - Fix CFLAGS hard-coded in configure.in
-- Fix threading bug re: gethostbyname() that caused random 
-URLs to fail in some cases.
+- Fix threading bug re: gethostbyname() that caused random
+  URLs to fail in some cases.
 
 
 *** Version 2.9.11 Alpha Changes ***
@@ -476,7 +1668,7 @@ The only other URLs left are the GNU GPL:
 and the home page:
   http://ijbswa.sourceforge.net/
 ... and various URLs which will be intercepted by Junkbuster anyway.
-TODO: Still need to do something with the URLs in Junkbuster Corp's 
+TODO: Still need to do something with the URLs in Junkbuster Corp's
 copyright/trademark notice on the bottom of the show-proxy-args page.
 - PCRE or GNU Regex is now a #define option.
 
@@ -500,7 +1692,7 @@ parsers.c (again). They obviously got lost in our current
 patch war ;-)
 - Cut the credit for the §-referrer-option from the config file,
 that Stefan had placed there.
-- Improved the re_filterfile 
+- Improved the re_filterfile
 
 
 *** Version 2.9.0 pre-Alpha Changes ***
@@ -508,9 +1700,9 @@ that Stefan had placed there.
 -  Now use PCRE, not GNU REGEX.  I have not yet had chance to check the
 syntax of the block/image/cookie file to ensure that they match what
 is expected - however they seem to work.
--  Replaced "configure" script with one generated by "autoconf".  Also 
-use a header "config.h" (was ijbconfig.h in my previous release) for 
-the #defines.  "config.h" is now generated with "autoheader" from 
+-  Replaced "configure" script with one generated by "autoconf".  Also
+use a header "config.h" (was ijbconfig.h in my previous release) for
+the #defines.  "config.h" is now generated with "autoheader" from
 "acconfig.h" and "configure.in".  (Note that to install you do not
 need autoconf or autoheader - just run "./configure".)
 To see command-line options, run "./configure --help".
@@ -523,7 +1715,7 @@ apply all of these, since I had already independently done conditional
 popup file, conditional image file, and integration of popup code.
 - ACL, Jar and trust files conditionally compiled.
 - New source file headers.
-- Various cosmetic changes.  (But I have not consistently ordered the 
+- Various cosmetic changes.  (But I have not consistently ordered the
 config files - I think that's worthwhile, but it's 1am and I want to
 get this released!)
 - RCS tags on .h files.
@@ -549,16 +1741,15 @@ being a mix of "U.S. English", "U.K. English" and "Irish English".
 - Version number changes to 2.9.0
 
 
-
 ----------------------------------------------------------------------
-Copyright   :  Written by and Copyright (C) 2001-2007 the SourceForge
+Copyright   :  Written by and Copyright (C) 2001-2010 the
                Privoxy team. http://www.privoxy.org/
 
                Based on the Internet Junkbuster originally written
-               by and Copyright (C) 1997 Anonymous Coders and 
+               by and Copyright (C) 1997 Anonymous Coders and
                Junkbusters Corporation.  http://www.junkbusters.com/
 
-               This program is free software; you can redistribute it 
+               This program is free software; you can redistribute it
                and/or modify it under the terms of the GNU General
                Public License as published by the Free Software
                Foundation; either version 2 of the License, or (at
@@ -575,12 +1766,3 @@ Copyright   :  Written by and Copyright (C) 2001-2007 the SourceForge
                http://www.gnu.org/copyleft/gpl.html
                or write to the Free Software Foundation, Inc., 59
                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-               Note that parts of Privoxy are under licenses that are
-               GPL-compatible but less restrictive - for details see
-               Privoxy's source code. The Privoxy team doesn't hold the
-               copyright for these parts and doesn't relicense them either.
-               You are free to extract them again to distribute them under
-               their own license.
-	
-set vi:tw=68