[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r1334: Move bundle installer stuff in pkg/win32/bundle/ to pkg/win3 (trunk/pkg/win32)



Author: edmanm
Date: 2006-10-13 21:57:50 -0400 (Fri, 13 Oct 2006)
New Revision: 1334

Added:
   trunk/pkg/win32/BUNDLE_LICENSE
   trunk/pkg/win32/build-bundle.txt
   trunk/pkg/win32/bundle.nsi
   trunk/pkg/win32/privoxy.config
Removed:
   trunk/pkg/win32/bundle/
Log:
Move bundle installer stuff in pkg/win32/bundle/ to pkg/win32/ to make it
easier to share translated installer strings. For my next trick, we'll
actually support translated installer strings.


Copied: trunk/pkg/win32/BUNDLE_LICENSE (from rev 1329, trunk/pkg/win32/bundle/BUNDLE_LICENSE)
===================================================================
--- trunk/pkg/win32/BUNDLE_LICENSE	                        (rev 0)
+++ trunk/pkg/win32/BUNDLE_LICENSE	2006-10-14 01:57:50 UTC (rev 1334)
@@ -0,0 +1,491 @@
+=====================================================
+bundle.nsi is distributed under this license
+
+bundle.nsi : Pre-configured Vidalia/Tor/Privoxy bundled installer.
+Copyright (C) 2006  Matt Edman
+
+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 your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+=====================================================
+
+=====================================================
+Vidalia is distributed under the following license:
+ 
+ Copyright (C) 2006,  Matt Edman, Justin Hipple
+
+ 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 your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+ 02110-1301, USA.
+=====================================================
+
+=====================================================
+Tor is distributed under this license:
+
+Copyright (c) 2001-2005 Roger Dingledine
+Copyright (c) 2004-2005 Nick Mathewson
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+    * Neither the names of the copyright owners nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=====================================================
+src/or/tree.h by Niels Provos is licensed as follows:
+
+ * Copyright 2002 Niels Provos <provos@xxxxxxxxxxxxxx>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=====================================================
+src/common/strlcat.c and src/common/strlcpy.c by Todd C. Miller are licensed
+under the following license:
+
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@xxxxxxxxxxxxx>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=====================================================
+If you got Tor as a static binary with OpenSSL included, then you should know:
+ "This product includes software developed by the OpenSSL Project
+ for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+=====================================================
+
+Privoxy is distributed under the following license:
+=====================================================
+   Copyright (C) 2001, 2002 Privoxy Developers <developers@xxxxxxxxxxx>, 
+   and licensed under the GNU General Public License.
+
+
+              GNU GENERAL PUBLIC LICENSE
+               Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+            GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+             END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+=====================================================
+config.txt distributed with Privoxy was modified on 
+12/13/2005 for Vidalia/Tor/Privoxy bundled and pre-configured 
+installer
+
+The original, unmodified version of config.txt has been
+retained in the package and can be found as config.orig.txt
+

Copied: trunk/pkg/win32/build-bundle.txt (from rev 1329, trunk/pkg/win32/bundle/build-bundle.txt)
===================================================================
--- trunk/pkg/win32/build-bundle.txt	                        (rev 0)
+++ trunk/pkg/win32/build-bundle.txt	2006-10-14 01:57:50 UTC (rev 1334)
@@ -0,0 +1,45 @@
+                Building the Vidalia/Tor/Privoxy Bundle
+
+
+1. Create a base directory under which the necessary sources will be extracted
+and place the .nsi file in it. For this example, we will just use C:\bundle\.
+      
+       C:\bundle\bundle.nsi
+
+2. Create directories for each component in the bundle.
+
+        C:\bundle\privoxy\
+        C:\bundle\tor\
+        C:\bundle\vidalia\
+
+3. Modify the appropriate version values (VIDALIA_VERSION, TOR_VERSION, and
+PRIVOXY_VERSION) at the top of the .nsi file.
+
+4. Create directories for the appropriate versions of each component.
+
+        C:\bundle\privoxy\3.0.3\
+        C:\bundle\tor\0.1.1.20\
+        C:\bundle\vidalia\0.0.6\
+
+5. Install Vidalia, Tor, and Privoxy to the directories you created for them.
+
+6. Modify Privoxy's config.txt file as follows:
+
+    * Add "forward-socks4a / localhost:9050 ." (without quotes) to the top
+    * Comment out "logfile privoxy.log" in Section 1.5
+    * Comment out "jarfile jar.log" in Section 1.6
+    * Uncomment "log-messages 1" in Section 6 and change the '1' to a '0'
+
+7. Install Tor to the directory you created for its version. Remember that you
+may need to grab the torrc.sample file from %APPDATA%\Tor that was created by
+the installer and place it in the directory for the bundle's version of Tor.
+
+8. Run the .nsi script. The bundle will be named according the the versions
+you specified in Step 4 and placed in the base directory created in Step 1.
+
+--------------------------------------------------------------------------------
+
+For each additional release of some component of the bundle, follow Steps 4-9.
+If the version of some component didn't change, you can skip its step. For
+example, if the version of Privoxy didn't change then you can skip Step 6.
+

Copied: trunk/pkg/win32/bundle.nsi (from rev 1332, trunk/pkg/win32/bundle/bundle.nsi)
===================================================================
--- trunk/pkg/win32/bundle.nsi	                        (rev 0)
+++ trunk/pkg/win32/bundle.nsi	2006-10-14 01:57:50 UTC (rev 1334)
@@ -0,0 +1,372 @@
+;---------------------------------
+; Vidalia/Tor/Privoxy Bundle Installer
+; See BUNDLE_LICENSE for licensing information
+
+;
+!include "MUI.nsh"
+
+;---------------------------------
+; Global Definitions
+!define VIDALIA_NAME "Vidalia"
+!define VIDALIA_EXEC "vidalia.exe"
+!define VIDALIA_UNINST "uninstall.exe"
+!define VIDALIA_VERSION "0.0.8"
+
+!define TOR_NAME "Tor"
+!define TOR_EXEC "tor.exe"
+!define TOR_UNINST "Uninstall.exe"
+!define TOR_VERSION "0.1.1.23"
+
+!define PRIVOXY_NAME "Privoxy"
+!define PRIVOXY_EXEC "privoxy.exe"
+!define PRIVOXY_UNINST "privoxy_uninstall.exe"
+!define PRIVOXY_VERSION "3.0.3"
+
+!define BUNDLE_REVISION "1"
+
+!define APPNAME "Vidalia Bundle"
+!define APPVERSION "${TOR_VERSION}-${VIDALIA_VERSION}"
+!define PRODVERSION "${VIDALIA_VERSION}.${BUNDLE_REVISION}" ; Product version must be x.x.x.x
+!define APPDESCRIPTION "${APPNAME} ${APPVERSION}"
+!define INSTALLFILE "vidalia-bundle-${APPVERSION}.exe"
+
+
+;--------------------------------
+; Basic Installer Information
+Name "Vidalia-Tor-Privoxy Bundle"
+Caption "Vidalia-Tor-Privoxy Bundle"
+BrandingText "${APPDESCRIPTION} (Rev. ${BUNDLE_REVISION})"
+OutFile "${INSTALLFILE}"
+CRCCheck on
+
+VIAddVersionKey "ProductName" "${APPNAME}"
+VIAddVersionKey "Comments" "${APPDESCRIPTION}"
+VIAddVersionKey "FileVersion" "${APPVERSION}"
+VIAddVersionKey "FileDescription" "${APPDESCRIPTION}"
+VIProductVersion "${PRODVERSION}"
+
+OutFile "${INSTALLFILE}"
+
+InstallDir "$PROGRAMFILES"
+
+SetCompressor /SOLID lzma
+SetOverWrite ifnewer
+AutoCloseWindow false
+ShowInstDetails show
+XPStyle on
+
+
+;--------------------------------
+; Install Types
+!ifndef NOINSTTYPES ; only if not defined
+  InstType "Full"
+  InstType "Base"
+  ;InstType /COMPONENTSONLYONCUSTOM
+!endif
+
+
+;--------------------------------
+; MUI Options
+!define MUI_WELCOMEPAGE_TITLE "Welcome to the ${APPNAME} Setup Wizard"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of:\r\n\tVidalia\t${VIDALIA_VERSION}\r\n\tTor\t${TOR_VERSION}\r\n\tPrivoxy\t${PRIVOXY_VERSION}\r\n\r\nIf you have previously installed Vidalia, Tor, or Privoxy, please make sure they are not running before continuing this installation.\r\n\r\n$_CLICK"
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
+!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_FINISHPAGE_TEXT "Installation is complete.\r\n\r\nPlease see http://tor.eff.org/docs/tor-doc-win32.html to learn how to configure your applications to use Tor.\r\n"
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_FUNCTION CustomFinishFn
+!define MUI_FINISHPAGE_RUN_TEXT "Run installed components now"
+
+;--------------------------------
+; Pages
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_LANGUAGE "English"
+
+;--------------------------------
+; Tor
+Var configdir
+Var configfile
+var bInstallTor
+SectionGroup "!Tor ${TOR_VERSION}" TorGroup
+    Section "Tor" Tor
+    ;Files that have to be installed for tor to run and that the user
+    ;cannot choose not to install
+       SectionIn 1 2
+       SetOutPath "$INSTDIR\Tor"
+       File "tor\${TOR_VERSION}\tor.exe"
+       File "tor\${TOR_VERSION}\tor_resolve.exe"
+       File "tor\${TOR_VERSION}\${TOR_UNINST}"
+       WriteIniStr "$INSTDIR\Tor\Tor Website.url" "InternetShortcut" "URL" "http://tor.eff.org";
+
+       StrCpy $configfile "torrc"
+       StrCpy $configdir $APPDATA\Tor
+    ;   ;If $APPDATA isn't valid here (Early win95 releases with no updated
+    ;   ; shfolder.dll) then we put it in the program directory instead.
+    ;   StrCmp $APPDATA "" "" +2
+    ;      StrCpy $configdir $INSTDIR
+       SetOutPath $configdir
+       ;If there's already a torrc config file, ask if they want to
+       ;overwrite it with the new one.
+       IfFileExists "$configdir\torrc" "" endiftorrc
+          MessageBox MB_ICONQUESTION|MB_YESNO "You already have a Tor config file.$\r$\nDo you want to overwrite it with the default sample config file?" IDNO yesreplace
+          Delete $configdir\torrc
+          Goto endiftorrc
+         yesreplace:
+          StrCpy $configfile "torrc.sample"
+       endiftorrc:
+       File /oname=$configfile "tor\${TOR_VERSION}\torrc.sample"
+
+       ; Write the uninstall keys for Windows
+       WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "DisplayName" "${TOR_NAME} ${TOR_VERSION}"
+       WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "UninstallString" '"$INSTDIR\Tor\${TOR_UNINST}"'
+       WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoModify" 1
+       WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tor" "NoRepair" 1
+       
+       IntOp $bInstallTor 0 + 1
+    SectionEnd
+
+    Section "OpenSSL 0.9.8a" TorOpenSSL
+       SectionIn 1 2
+       SetOutPath "$INSTDIR\Tor"
+       File "tor\${TOR_VERSION}\libeay32.dll"
+       File "tor\${TOR_VERSION}\ssleay32.dll"
+    SectionEnd
+
+    Section "Documentation" TorDocs
+       SectionIn 1 2
+       SetOutPath "$INSTDIR\Tor\Documents"
+       File "tor\${TOR_VERSION}\Documents\*.*"
+    SectionEnd
+
+    Section "Add to Start Menu" TorStartMenu
+      SectionIn 1
+        SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+        SetOutPath "$INSTDIR\Tor"
+        IfFileExists "$SMPROGRAMS\Tor\*.*" "" +2
+           RMDir /r "$SMPROGRAMS\Tor"
+        
+        CreateDirectory "$SMPROGRAMS\Tor"
+        CreateShortCut "$SMPROGRAMS\Tor\Tor.lnk" "$INSTDIR\Tor\tor.exe"
+        CreateShortCut "$SMPROGRAMS\Tor\Torrc.lnk" "Notepad.exe" "$configdir\torrc"
+        CreateShortCut "$SMPROGRAMS\Tor\Tor Website.lnk" "$INSTDIR\Tor\Tor Website.url"
+        CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Tor\${TOR_UNINST}"
+        
+        IfFileExists "$INSTDIR\Tor\Documents\*.*" "" endifdocs
+          CreateDirectory "$SMPROGRAMS\Tor\Documents"
+          CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Documentation.lnk" "$INSTDIR\Tor\Documents"
+          CreateShortCut "$SMPROGRAMS\Tor\Documents\Version Specification.lnk" "$INSTDIR\Tor\Documents\version-spec.txt"
+        endifdocs:
+    SectionEnd
+SectionGroupEnd
+
+
+;--------------------------------
+; Vidalia
+var bInstallVidalia
+SectionGroup "Vidalia ${VIDALIA_VERSION}" VidaliaGroup
+    Section "Vidalia" Vidalia
+      SectionIn 1 2
+
+      ; Set output path to the installation directory.
+      SetOutPath "$INSTDIR\Vidalia"
+      File "Vidalia\${VIDALIA_VERSION}\${VIDALIA_EXEC}"
+      File "Vidalia\${VIDALIA_VERSION}\${VIDALIA_UNINST}"
+      File "Vidalia\${VIDALIA_VERSION}\mingwm10.dll"
+      File "Vidalia\${VIDALIA_VERSION}\README"
+      File "Vidalia\${VIDALIA_VERSION}\CHANGELOG"
+      File "Vidalia\${VIDALIA_VERSION}\LICENSE"
+      File "Vidalia\${VIDALIA_VERSION}\COPYING"
+      File "Vidalia\${VIDALIA_VERSION}\AUTHORS"
+      File "BUNDLE_LICENSE"
+      
+      ; Tor gets installed to $INSTDIR\Tor, so let's remember it
+      ; But first, we have to replace all the '\'s with '\\'s in the $INSTDIR
+      ; Does NSIS make this easy by providing the ability to replace substrings? No.
+      Push $INSTDIR
+      Push "\"
+      Push "\\"
+      Call StrRep
+      Pop $R0 ; contains the modified version of $INSTDIR
+
+      SetShellVarContext current
+      IfFileExists "$APPDATA\Vidalia" EndIfConf
+        CreateDirectory "$APPDATA\Vidalia"
+      EndIfConf:
+      WriteINIStr "$APPDATA\Vidalia\vidalia.conf" Tor TorExecutable "$R0\\Tor\\${TOR_EXEC}"
+      SetShellVarContext all
+
+      ; Write the uninstall keys for Windows  
+      WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "DisplayName" "${VIDALIA_NAME} ${VIDALIA_VERSION}"
+      WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "UninstallString" '"$INSTDIR\Vidalia\${VIDALIA_UNINST}"'
+      WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoModify" 1
+      WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Vidalia" "NoRepair" 1
+      
+      IntOp $bInstallVidalia 0 + 1
+    SectionEnd
+
+    ;--------------------------------
+    ; Start Menu Shortcuts
+    ; Optional section (can be disabled by the user)
+    Section "Add to Start Menu" VidaliaShortcuts
+      SectionIn 1 2
+      SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+      CreateDirectory "$SMPROGRAMS\Vidalia"
+      CreateShortCut "$SMPROGRAMS\Vidalia\Uninstall.lnk" "$INSTDIR\Vidalia\uninstall.exe" "" "$INSTDIR\Vidalia\${VIDALIA_UNINST}" 0
+      CreateShortCut "$SMPROGRAMS\Vidalia\Vidalia.lnk" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" "" "$INSTDIR\Vidalia\${VIDALIA_EXEC}" 0
+    SectionEnd
+
+    ;--------------------------------
+    ; Run At Startup
+    Section "Run At Startup" VidaliaRunAtStartup
+      SectionIn 1 2
+      WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${VIDALIA_NAME}" '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
+    SectionEnd    
+SectionGroupEnd
+
+
+;--------------------------------
+; Privoxy
+var bInstallPrivoxy
+SectionGroup "Privoxy ${PRIVOXY_VERSION}" PrivoxyGroup
+    Section "Privoxy" Privoxy
+        SectionIn 1 2
+        ; add files / whatever that need to be installed here.
+        SetOutPath "$INSTDIR\Privoxy"
+        File /r Privoxy\${PRIVOXY_VERSION}\*.*
+
+        WriteRegStr HKEY_CLASSES_ROOT "PrivoxyActionFile\shell\open\command" "" 'Notepad.exe "%1"'
+        WriteRegStr HKEY_CLASSES_ROOT ".action" "" "PrivoxyActionFile"
+        WriteRegStr HKEY_CLASSES_ROOT "PrivoxyFilterFile\shell\open\command" "" 'Notepad.exe "%1"'
+        WriteRegStr HKEY_CLASSES_ROOT ".filter" "" "PrivoxyFilterFile"
+       
+        ; Write the installation path into the registry
+        WriteRegStr HKCU SOFTWARE\Privoxy "Install_Dir" "$INSTDIR"
+
+        ; Write the uninstall keys for Windows
+        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "DisplayName" "${PRIVOXY_NAME} ${PRIVOXY_VERSION}"
+        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "UninstallString" '"$INSTDIR\Privoxy\${PRIVOXY_UNINST}"'
+        WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoModify" 1
+        WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Privoxy" "NoRepair" 1
+               
+       
+        IntOp $bInstallPrivoxy 0 + 1
+    SectionEnd
+
+    Section "Add to Start Menu" PrivoxyStartMenu
+        SectionIn 1
+        SetShellVarContext all ; (Add to "All Users" Start Menu if possible)
+        RMDir /r "$SMPROGRAMS\Privoxy"
+        CreateDirectory "$SMPROGRAMS\Privoxy"
+        CreateShortCut "$SMPROGRAMS\Privoxy\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe"
+        WriteINIStr "$SMPROGRAMS\Privoxy\Web-based Configuration.url" "InternetShortcut" "URL" "http://config.privoxy.org/";
+        CreateShortCut "$SMPROGRAMS\Privoxy\Web-based Feedback.lnk" "$INSTDIR\Privoxy\doc\user-manual\contact.html"
+        CreateDirectory "$SMPROGRAMS\Privoxy\Edit Config"
+        CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Main Configuration.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\config.txt"'
+        CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Default Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.action"'
+        CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\User Actions.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\user.action"'
+        CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Filters.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\default.filter"'
+        CreateShortCut "$SMPROGRAMS\Privoxy\Edit Config\Trust list.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\trust.txt"'
+        CreateDirectory "$SMPROGRAMS\Privoxy\Documentation"
+        CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\User Manual.lnk" "$INSTDIR\Privoxy\doc\user-manual\index.html"
+        CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\Frequently Asked Questions.lnk" "$INSTDIR\Privoxy\doc\faq\index.html"
+        CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\Credits.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\AUTHORS.txt"'
+        CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\License.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\LICENSE.txt"'
+        CreateShortCut "$SMPROGRAMS\Privoxy\Documentation\ReadMe file.lnk" "Notepad.exe" '"$INSTDIR\Privoxy\README.txt"'
+        WriteINIStr "$SMPROGRAMS\Privoxy\Documentation\Web Site.url" "InternetShortcut" "URL" "http://privoxy.org/";
+        CreateShortCut "$SMPROGRAMS\Privoxy\Privoxy Uninstall.lnk" "$INSTDIR\Privoxy\${PRIVOXY_UNINST}"
+    SectionEnd
+ 
+    ;--------------------------------
+    ; Run At Startup
+    Section "Run At Startup" PrivoxyRunAtStartup
+      SectionIn 1
+      CreateShortCut "$SMSTARTUP\Privoxy.lnk" "$INSTDIR\Privoxy\privoxy.exe" "" "" 0 SW_SHOWMINIMIZED
+    SectionEnd     
+SectionGroupEnd
+
+Function CustomFinishFn
+    IntCmp $bInstallVidalia 1 run_vidalia check_tor check_tor
+    run_vidalia:
+        Exec '"$INSTDIR\Vidalia\${VIDALIA_EXEC}"'
+        goto check_privoxy
+    
+    check_tor:
+    IntCmp $bInstallTor 1 run_tor check_privoxy check_privoxy
+    run_tor:
+        Exec '"$INSTDIR\Tor\${TOR_EXEC}"'
+    
+    check_privoxy:
+    IntCmp $bInstallPrivoxy 1 run_privoxy done done
+    run_privoxy:
+        Exec '"$INSTDIR\Privoxy\${PRIVOXY_EXEC}"'
+    done:
+FunctionEnd
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${Tor} "Install ${TOR_NAME} ${TOR_VERSION}"
+  !insertmacro MUI_DESCRIPTION_TEXT ${TorGroup} "Install ${TOR_NAME} ${TOR_VERSION}"
+  !insertmacro MUI_DESCRIPTION_TEXT ${TorDocs} "Install ${TOR_NAME} documentation"
+  !insertmacro MUI_DESCRIPTION_TEXT ${TorOpenSSL} "Install OpenSSL 0.9.7e"
+  !insertmacro MUI_DESCRIPTION_TEXT ${TorStartMenu} "Add ${TOR_NAME} to your Start menu"
+
+  !insertmacro MUI_DESCRIPTION_TEXT ${Vidalia} "Install ${VIDALIA_NAME} ${VIDALIA_VERSION}"
+  !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaGroup} "Install ${VIDALIA_NAME} ${VIDALIA_VERSION}"
+  !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaShortcuts} "Add ${VIDALIA_NAME} to your Start menu"
+  !insertmacro MUI_DESCRIPTION_TEXT ${VidaliaRunAtStartup} "Run ${VIDALIA_NAME} at startup"
+
+  !insertmacro MUI_DESCRIPTION_TEXT ${Privoxy} "Install ${PRIVOXY_NAME} ${PRIVOXY_VERSION}"
+  !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyGroup} "Install ${PRIVOXY_NAME} ${PRIVOXY_VERSION}"
+  !insertmacro MUI_DESCRIPTION_TEXT ${PrivoxyStartMenu} "Add ${PRIVOXY_NAME} to your Start menu"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+Function StrRep
+ 
+  ;Written by dirtydingus 2003-02-20 04:30:09 
+  ; USAGE
+  ;Push String to do replacement in (haystack)
+  ;Push String to replace (needle)
+  ;Push Replacement
+  ;Call StrRep
+  ;Pop $R0 result	
+ 
+  Exch $R4 ; $R4 = Replacement String
+  Exch
+  Exch $R3 ; $R3 = String to replace (needle)
+  Exch 2
+  Exch $R1 ; $R1 = String to do replacement in (haystack)
+  Push $R2 ; Replaced haystack
+  Push $R5 ; Len (needle)
+  Push $R6 ; len (haystack)
+  Push $R7 ; Scratch reg
+  StrCpy $R2 ""
+  StrLen $R5 $R3
+  StrLen $R6 $R1
+loop:
+  StrCpy $R7 $R1 $R5
+  StrCmp $R7 $R3 found
+  StrCpy $R7 $R1 1 ; - optimization can be removed if U know len needle=1
+  StrCpy $R2 "$R2$R7"
+  StrCpy $R1 $R1 $R6 1
+  StrCmp $R1 "" done loop
+found:
+  StrCpy $R2 "$R2$R4"
+  StrCpy $R1 $R1 $R6 $R5
+  StrCmp $R1 "" done loop
+done:
+  StrCpy $R3 $R2
+  Pop $R7
+  Pop $R6
+  Pop $R5
+  Pop $R2
+  Pop $R1
+  Pop $R4
+  Exch $R3
+	
+FunctionEnd
+

Copied: trunk/pkg/win32/privoxy.config (from rev 1329, trunk/pkg/win32/bundle/privoxy.config)
===================================================================
--- trunk/pkg/win32/privoxy.config	                        (rev 0)
+++ trunk/pkg/win32/privoxy.config	2006-10-14 01:57:50 UTC (rev 1334)
@@ -0,0 +1,1073 @@
+#        Sample Configuration File for Privoxy v3.0.x
+#  
+#  Copyright (C) 2001-2004 Privoxy Developers http://privoxy.org
+#  
+#  $Id: privoxy.config,v 1.4 2005/09/24 20:49:45 phobos Exp $
+#  
+####################################################################
+#                                                                  #
+#                      Table of Contents                           #
+#                                                                  #
+#        I. INTRODUCTION                                           #
+#       II. FORMAT OF THE CONFIGURATION FILE                       #
+#                                                                  #
+#        1. CONFIGURATION AND LOG FILE LOCATIONS                   #
+#        2. LOCAL SET-UP DOCUMENTATION                             #
+#        3. DEBUGGING                                              #
+#        4. ACCESS CONTROL AND SECURITY                            #
+#        5. FORWARDING                                             #
+#        6. WINDOWS GUI OPTIONS                                    #
+#                                                                  #
+####################################################################
+#  
+#  
+#  I. INTRODUCTION
+#   ===============
+#  
+#  This file holds the Privoxy configuration. If you modify this file,
+#  you will need to send a couple of requests to the proxy before any
+#  changes take effect.
+#  
+#  When starting Privoxy on Unix systems, give the name of this file as
+#  an argument. On Windows systems, Privoxy will look for this file
+#  with the name 'config.txt' in the same directory where Privoxy
+#  is installed.
+#  
+#  
+#  II. FORMAT OF THE CONFIGURATION FILE
+#  ====================================
+#  
+#  Configuration lines consist of an initial keyword followed by a
+#  list of values, all separated by whitespace (any number of spaces
+#  or tabs). For example,
+#  
+#  actionsfile default.action
+#  
+#  Indicates that the actionsfile is named 'default.action'.
+#  
+#  The '#' indicates a comment. Any part of a line following a '#'
+#  is ignored, except if the '#' is preceded by a '\'.
+#  
+#  Thus, by placing a # at the start of an existing configuration line,
+#  you can make it a comment and it will be treated as if it weren't
+#  there. This is called "commenting out" an option and can be useful.
+#  
+#  Note that commenting out and option and leaving it at its default
+#  are two completely different things! Most options behave very
+#  differently when unset.  See the the "Effect if unset" explanation
+#  in each option's description for details.
+#  
+#  Long lines can be continued on the next line by using a `\' as the
+#  last character.
+#  
+
+#  
+#  1. CONFIGURATION AND LOG FILE LOCATIONS
+#  =======================================
+#  
+#  Privoxy can (and normally does) use a number of other files for
+#  additional configuration, help and logging. This section of the
+#  configuration file tells Privoxy where to find those other files.
+#  
+#  The user running Privoxy, must have read permission for all
+#  configuration files, and write permission to any files that would
+#  be modified, such as log files and actions files.
+#  
+
+#  
+#  1.1. confdir
+#  ============
+#  
+#  Specifies:
+#  
+#      The directory where the other configuration files are located
+#  
+#  Type of value:
+#  
+#      Path name
+#  
+#  Default value:
+#  
+#      /etc/privoxy (Unix) or Privoxy installation dir (Windows)
+#  
+#  Effect if unset:
+#  
+#      Mandatory
+#  
+#  Notes:
+#  
+#      No trailing "/", please
+#  
+#      When development goes modular and multi-user, the blocker,
+#      filter, and per-user config will be stored in subdirectories of
+#      "confdir". For now, the configuration directory structure is
+#      flat, except for confdir/templates, where the HTML templates
+#      for CGI output reside (e.g. Privoxy's 404 error page).
+#  
+confdir .
+
+#  
+#  1.2. logdir
+#  ===========
+#  
+#  Specifies:
+#  
+#      The directory where all logging takes place (i.e. where logfile
+#      and jarfile are located)
+#  
+#  Type of value:
+#  
+#      Path name
+#  
+#  Default value:
+#  
+#      /var/log/privoxy (Unix) or Privoxy installation dir (Windows)
+#  
+#  Effect if unset:
+#  
+#      Mandatory
+#  
+#  Notes:
+#  
+#      No trailing "/", please
+#  
+logdir .
+
+#  
+#  1.3. actionsfile
+#  ================
+#  
+#  Specifies:
+#  
+#      The actions file(s) to use
+#  
+#  Type of value:
+#  
+#      File name, relative to confdir, without the .action suffix
+#  
+#  Default values:
+#  
+#        standard     # Internal purposes, no editing recommended
+#  
+#        default      # Main actions file
+#  
+#        user         # User customizations
+#  
+#  Effect if unset:
+#  
+#      No actions are taken at all. Simple neutral proxying.
+#  
+#  Notes:
+#  
+#      Multiple actionsfile lines are permitted, and are in fact
+#      recommended!
+#  
+#      The default values include standard.action, which is used
+#      for internal purposes and should be loaded, default.action,
+#      which is the "main" actions file maintained by the developers,
+#      and user.action, where you can make your personal additions.
+#  
+#      Actions files are where all the per site and per URL
+#      configuration is done for ad blocking, cookie management,
+#      privacy considerations, etc. There is no point in using Privoxy
+#      without at least one actions file.
+#  
+actionsfile standard  # Internal purpose, recommended
+actionsfile default   # Main actions file
+actionsfile user      # User customizations
+
+#  
+#  1.4. filterfile
+#  ===============
+#  
+#  Specifies:
+#  
+#      The filter file to use
+#  
+#  Type of value:
+#  
+#      File name, relative to confdir
+#  
+#  Default value:
+#  
+#      default.filter (Unix) or default.filter.txt (Windows)
+#  
+#  Effect if unset:
+#  
+#      No textual content filtering takes place, i.e. all +filter{name}
+#      actions in the actions files are turned neutral.
+#  
+#  Notes:
+#  
+#      The filter file contains content modification rules that use
+#      regular expressions. These rules permit powerful changes on the
+#      content of Web pages, e.g., you could disable your favorite
+#      JavaScript annoyances, re-write the actual displayed text,
+#      or just have some fun replacing "Microsoft" with "MicroSuck"
+#      wherever it appears on a Web page.
+#  
+#      The +filter{name} actions rely on the relevant filter (name)
+#      to be defined in the filter file!
+#  
+#      A pre-defined filter file called default.filter that contains
+#      a bunch of handy filters for common problems is included in the
+#      distribution. See the section on the filter action for a list.
+#  
+filterfile default.filter
+
+#  
+#  1.5. logfile
+#  ============
+#  
+#  Specifies:
+#  
+#      The log file to use
+#  
+#  Type of value:
+#  
+#      File name, relative to logdir
+#  
+#  Default value:
+#  
+#      logfile (Unix) or privoxy.log (Windows)
+#  
+#  Effect if unset:
+#  
+#      No log file is used, all log messages go to the console (STDERR).
+#  
+#  Notes:
+#  
+#      The windows version will additionally log to the console.
+#  
+#      The logfile is where all logging and error messages are
+#      written. The level of detail and number of messages are set with
+#      the debug option (see below).  The logfile can be useful for
+#      tracking down a problem with Privoxy (e.g., it's not blocking
+#      an ad you think it should block) but in most cases you probably
+#      will never look at it.
+#  
+#      Your logfile will grow indefinitely, and you will probably
+#      want to periodically remove it. On Unix systems, you can do
+#      this with a cron job (see "man cron"). For Red Hat, a logrotate
+#      script has been included.
+#  
+#      On SuSE Linux systems, you can place a line like
+#      "/var/log/privoxy.* +1024k 644 nobody.nogroup" in /etc/logfiles,
+#      with the effect that cron.daily will automatically archive,
+#      gzip, and empty the log, when it exceeds 1M size.
+#  
+#      Any log files must be writable by whatever user Privoxy is
+#      being run as (default on UNIX, user id is "privoxy").
+#  
+#logfile logfile
+
+#  
+#  1.6. jarfile
+#  ============
+#  
+#  Specifies:
+#  
+#      The file to store intercepted cookies in
+#  
+#  Type of value:
+#  
+#      File name, relative to logdir
+#  
+#  Default value:
+#  
+#      jarfile (Unix) or privoxy.jar (Windows)
+#  
+#  Effect if unset:
+#  
+#      Intercepted cookies are not stored at all.
+#  
+#  Notes:
+#  
+#      The jarfile may grow to ridiculous sizes over time.
+#  
+#jarfile jarfile
+
+#  
+#  1.7. trustfile
+#  ==============
+#  
+#  Specifies:
+#  
+#      The trust file to use
+#  
+#  Type of value:
+#  
+#      File name, relative to confdir
+#  
+#  Default value:
+#  
+#      Unset (commented out). When activated: trust (Unix) or trust.txt
+#      (Windows)
+#  
+#  Effect if unset:
+#  
+#      The entire trust mechanism is turned off.
+#  
+#  Notes:
+#  
+#      The trust mechanism is an experimental feature for building
+#      white-lists and should be used with care. It is NOT recommended
+#      for the casual user.
+#  
+#      If you specify a trust file, Privoxy will only allow access to
+#      sites that are specified in the trustfile. Sites can be listed
+#      in one of two ways:
+#  
+#      Prepending a ~ character limits access to this site only (and
+#      any sub-paths within this site), e.g. ~www.example.com.
+#  
+#      Or, you can designate sites as trusted referrers, by prepending
+#      the name with a + character. The effect is that access to
+#      untrusted sites will be granted -- but only if a link from this
+#      trusted referrer was used. The link target will then be added
+#      to the "trustfile" so that future, direct accesses will be
+#      granted. Sites added via this mechanism do not become trusted
+#      referrers themselves (i.e. they are added with a ~ designation).
+#  
+#      If you use the + operator in the trust file, it may grow
+#      considerably over time.
+#  
+#      It is recommended that Privoxy be compiled with the
+#      --disable-force, --disable-toggle and --disable-editor options,
+#      if this feature is to be used.
+#  
+#      Possible applications include limiting Internet access for
+#      children.
+#  
+#trustfile trust
+
+#  
+#  2. LOCAL SET-UP DOCUMENTATION
+#  =============================
+#  
+#  If you intend to operate Privoxy for more users than just yourself,
+#  it might be a good idea to let them know how to reach you, what
+#  you block and why you do that, your policies, etc.
+#  
+
+#  
+#  2.1. user-manual
+#  ================
+#  
+#  Specifies:
+#  
+#      Location of the Privoxy User Manual.
+#  
+#  Type of value:
+#  
+#      A fully qualified URI
+#  
+#  Default value:
+#  
+#      Unset
+#  
+#  Effect if unset:
+#  
+#      http://www.privoxy.org/version/user-manual/ will be used,
+#      where version is the Privoxy version.
+#  
+#  Notes:
+#  
+#      The User Manual URI is used for help links from some of the
+#      internal CGI pages. The manual itself is normally packaged
+#      with the binary distributions, so you probably want to set this
+#      to a locally installed copy. For multi-user setups, you could
+#      provide a copy on a local webserver for all your users and use
+#      the corresponding URL here.
+#  
+#      Examples:
+#  
+#      Unix, in local filesystem:
+#  
+#       user-manual file:///usr/share/doc/privoxy-3.0.1/user-manual/index.html
+#  
+#      Windows, in local filesystem, must use forward slash notation,
+#      and %20 to denote spaces in path names:
+#  
+#       user-manual file:///c:/some%20dir/privoxy/user-manual/index.html
+#  
+#      Windows, UNC notation (forward slashes required again):
+#  
+#       user-manual file://///some-server/some-path/privoxy/user-manual/index.html
+#  
+#      Any platform, on local webserver (called "local-webserver"):
+#  
+#       user-manual  http://local-webserver/privoxy-user-manual/
+#  
+#      WARNING!!!
+#  
+#          If set, this option should be the first option in the config
+#          file, because it is used while the config file is being read.
+#  
+#user-manual http://www.privoxy.org/user-manual/
+
+#  
+#  2.2. trust-info-url
+#  ===================
+#  
+#  Specifies:
+#  
+#      A URL to be displayed in the error page that users will see if
+#      access to an untrusted page is denied.
+#  
+#  Type of value:
+#  
+#      URL
+#  
+#  Default value:
+#  
+#      Two example URL are provided
+#  
+#  Effect if unset:
+#  
+#      No links are displayed on the "untrusted" error page.
+#  
+#  Notes:
+#  
+#      The value of this option only matters if the experimental trust
+#      mechanism has been activated. (See trustfile above.)
+#  
+#      If you use the trust mechanism, it is a good idea to write
+#      up some on-line documentation about your trust policy and to
+#      specify the URL(s) here. Use multiple times for multiple URLs.
+#  
+#      The URL(s) should be added to the trustfile as well, so users
+#      don't end up locked out from the information on why they were
+#      locked out in the first place!
+#  
+trust-info-url  http://www.example.com/why_we_block.html
+trust-info-url  http://www.example.com/what_we_allow.html
+
+#  
+#  2.3. admin-address
+#  ==================
+#  
+#  Specifies:
+#  
+#      An email address to reach the proxy administrator.
+#  
+#  Type of value:
+#  
+#      Email address
+#  
+#  Default value:
+#  
+#      Unset
+#  
+#  Effect if unset:
+#  
+#      No email address is displayed on error pages and the CGI user
+#      interface.
+#  
+#  Notes:
+#  
+#      If both admin-address and proxy-info-url are unset, the whole
+#      "Local Privoxy Support" box on all generated pages will not
+#      be shown.
+#  
+#admin-address privoxy-admin@xxxxxxxxxxx
+
+#  
+#  2.4. proxy-info-url
+#  ===================
+#  
+#  Specifies:
+#  
+#      A URL to documentation about the local Privoxy setup,
+#      configuration or policies.
+#  
+#  Type of value:
+#  
+#      URL
+#  
+#  Default value:
+#  
+#      Unset
+#  
+#  Effect if unset:
+#  
+#      No link to local documentation is displayed on error pages and
+#      the CGI user interface.
+#  
+#  Notes:
+#  
+#      If both admin-address and proxy-info-url are unset, the whole
+#      "Local Privoxy Support" box on all generated pages will not
+#      be shown.
+#  
+#      This URL shouldn't be blocked ;-)
+#  
+#proxy-info-url http://www.example.com/proxy-service.html
+
+#  
+#  3. DEBUGGING
+#  ============
+#  
+#  These options are mainly useful when tracing a problem. Note that
+#  you might also want to invoke Privoxy with the --no-daemon command
+#  line option when debugging.
+#  
+
+#  
+#  3.1. debug
+#  ==========
+#  
+#  Specifies:
+#  
+#      Key values that determine what information gets logged to
+#      the logfile.
+#  
+#  Type of value:
+#  
+#      Integer values
+#  
+#  Default value:
+#  
+#      12289 (i.e.: URLs plus informational and warning messages)
+#  
+#  Effect if unset:
+#  
+#      Nothing gets logged.
+#  
+#  Notes:
+#  
+#      The available debug levels are:
+#  
+#          debug         1 # show each GET/POST/CONNECT request 
+#          debug         2 # show each connection status 
+#          debug         4 # show I/O status 
+#          debug         8 # show header parsing 
+#          debug        16 # log all data into the logfile 
+#          debug        32 # debug force feature 
+#          debug        64 # debug regular expression filter
+#          debug       128 # debug fast redirects 
+#          debug       256 # debug GIF de-animation 
+#          debug       512 # Common Log Format
+#          debug      1024 # debug kill pop-ups 
+#          debug      2048 # CGI user interface 
+#          debug      4096 # Startup banner and warnings.
+#          debug      8192 # Non-fatal errors
+#  
+#      To select multiple debug levels, you can either add them or
+#      use multiple debug lines.
+#  
+#      A debug level of 1 is informative because it will show you each
+#      request as it happens. 1, 4096 and 8192 are highly recommended
+#      so that you will notice when things go wrong. The other levels
+#      are probably only of interest if you are hunting down a specific
+#      problem. They can produce a hell of an output (especially 16).
+#  
+#      The reporting of fatal errors (i.e. ones which crash Privoxy)
+#      is always on and cannot be disabled.
+#  
+#      If you want to use CLF (Common Log Format), you should set
+#      "debug 512" ONLY and not enable anything else.
+#  
+#debug   1    # show each GET/POST/CONNECT request
+debug   4096 # Startup banner and warnings
+debug   8192 # Errors - *we highly recommended enabling this*
+
+#  
+#  3.2. single-threaded
+#  ====================
+#  
+#  Specifies:
+#  
+#      Whether to run only one server thread
+#  
+#  Type of value:
+#  
+#      None
+#  
+#  Default value:
+#  
+#      Unset
+#  
+#  Effect if unset:
+#  
+#      Multi-threaded (or, where unavailable: forked) operation,
+#      i.e. the ability to serve multiple requests simultaneously.
+#  
+#  Notes:
+#  
+#      This option is only there for debug purposes and you should
+#      never need to use it. It will drastically reduce performance.
+#  
+#single-threaded
+
+#  
+#  4. ACCESS CONTROL AND SECURITY
+#  ==============================
+#  
+#  This section of the config file controls the security-relevant
+#  aspects of Privoxy's configuration.
+#  
+
+#  
+#  4.1. listen-address
+#  ===================
+#  
+#  Specifies:
+#  
+#      The IP address and TCP port on which Privoxy will listen for
+#      client requests.
+#  
+#  Type of value:
+#  
+#      [IP-Address]:Port
+#  
+#  Default value:
+#  
+#      127.0.0.1:8118
+#  
+#  Effect if unset:
+#  
+#      Bind to 127.0.0.1 (localhost), port 8118. This is suitable and
+#      recommended for home users who run Privoxy on the same machine
+#      as their browser.
+#  
+#  Notes:
+#  
+#      You will need to configure your browser(s) to this proxy address
+#      and port.
+#  
+#      If you already have another service running on port 8118, or
+#      if you want to serve requests from other machines (e.g. on your
+#      local network) as well, you will need to override the default.
+#  
+#      If you leave out the IP address, Privoxy will bind to all
+#      interfaces (addresses) on your machine and may become reachable
+#      from the Internet. In that case, consider using access control
+#      lists (ACL's, see below), and/or a firewall.
+#  
+#      If you open Privoxy to untrusted users, you will also want
+#      to turn off the enable-edit-actions and enable-remote-toggle
+#      options!
+#  
+#  Example:
+#  
+#      Suppose you are running Privoxy on a machine which has the
+#      address 192.168.0.1 on your local private network (192.168.0.0)
+#      and has another outside connection with a different address. You
+#      want it to serve requests from inside only:
+#  
+#        listen-address  192.168.0.1:8118
+#  
+listen-address  127.0.0.1:8118
+
+#  
+#  4.2. toggle
+#  ===========
+#  
+#  Specifies:
+#  
+#      Initial state of "toggle" status
+#  
+#  Type of value:
+#  
+#      1 or 0
+#  
+#  Default value:
+#  
+#      1
+#  
+#  Effect if unset:
+#  
+#      Act as if toggled on
+#  
+#  Notes:
+#  
+#      If set to 0, Privoxy will start in "toggled off" mode,
+#      i.e. behave like a normal, content-neutral proxy where all ad
+#      blocking, filtering, etc are disabled. See enable-remote-toggle
+#      below. This is not really useful anymore, since toggling is
+#      much easier via the web interface than via editing the conf file.
+#  
+#      The windows version will only display the toggle icon in the
+#      system tray if this option is present.
+#  
+toggle  1
+
+#  
+#  4.3. enable-remote-toggle
+#  =========================
+#  
+#  Specifies:
+#  
+#      Whether or not the web-based toggle feature may be used
+#  
+#  Type of value:
+#  
+#      0 or 1
+#  
+#  Default value:
+#  
+#      1
+#  
+#  Effect if unset:
+#  
+#      The web-based toggle feature is disabled.
+#  
+#  Notes:
+#  
+#      When toggled off, Privoxy acts like a normal, content-neutral
+#      proxy, i.e.  it acts as if none of the actions applied to
+#      any URL.
+#  
+#      For the time being, access to the toggle feature can not be
+#      controlled separately by "ACLs" or HTTP authentication, so that
+#      everybody who can access Privoxy (see "ACLs" and listen-address
+#      above) can toggle it for all users. So this option is not
+#      recommended for multi-user environments with untrusted users.
+#  
+#      Note that you must have compiled Privoxy with support for this
+#      feature, otherwise this option has no effect.
+#  
+enable-remote-toggle  1
+
+#  
+#  4.4. enable-edit-actions
+#  ========================
+#  
+#  Specifies:
+#  
+#      Whether or not the web-based actions file editor may be used
+#  
+#  Type of value:
+#  
+#      0 or 1
+#  
+#  Default value:
+#  
+#      1
+#  
+#  Effect if unset:
+#  
+#      The web-based actions file editor is disabled.
+#  
+#  Notes:
+#  
+#      For the time being, access to the editor can not be controlled
+#      separately by "ACLs" or HTTP authentication, so that everybody
+#      who can access Privoxy (see "ACLs" and listen-address above)
+#      can modify its configuration for all users. So this option is
+#      not recommended for multi-user environments with untrusted users.
+#  
+#      Note that you must have compiled Privoxy with support for this
+#      feature, otherwise this option has no effect.
+#  
+enable-edit-actions 1
+
+#  
+#  4.5. ACLs: permit-access and deny-access
+#  ========================================
+#  
+#  Specifies:
+#  
+#      Who can access what.
+#  
+#  Type of value:
+#  
+#      src_addr[/src_masklen] [dst_addr[/dst_masklen]]
+#  
+#      Where src_addr and dst_addr are IP addresses in dotted decimal
+#      notation or valid DNS names, and src_masklen and dst_masklen are
+#      subnet masks in CIDR notation, i.e. integer values from 2 to 30
+#      representing the length (in bits) of the network address. The
+#      masks and the whole destination part are optional.
+#  
+#  Default value:
+#  
+#      Unset
+#  
+#  Effect if unset:
+#  
+#      Don't restrict access further than implied by listen-address
+#  
+#  Notes:
+#  
+#      Access controls are included at the request of ISPs and systems
+#      administrators, and are not usually needed by individual
+#      users. For a typical home user, it will normally suffice to
+#      ensure that Privoxy only listens on the localhost (127.0.0.1)
+#      or internal (home) network address by means of the listen-address
+#      option.
+#  
+#      Please see the warnings in the FAQ that this proxy is not
+#      intended to be a substitute for a firewall or to encourage
+#      anyone to defer addressing basic security weaknesses.
+#  
+#      Multiple ACL lines are OK. If any ACLs are specified, then
+#      the Privoxy talks only to IP addresses that match at least one
+#      permit-access line and don't match any subsequent deny-access
+#      line. In other words, the last match wins, with the default
+#      being deny-access.
+#  
+#      If Privoxy is using a forwarder (see forward below) for a
+#      particular destination URL, the dst_addr that is examined is
+#      the address of the forwarder and NOT the address of the ultimate
+#      target. This is necessary because it may be impossible for the
+#      local Privoxy to determine the IP address of the ultimate target
+#      (that's often what gateways are used for).
+#  
+#      You should prefer using IP addresses over DNS names, because
+#      the address lookups take time. All DNS names must resolve! You
+#      can not use domain patterns like "*.org" or partial domain
+#      names. If a DNS name resolves to multiple IP addresses, only
+#      the first one is used.
+#  
+#      Denying access to particular sites by ACL may have undesired
+#      side effects if the site in question is hosted on a machine
+#      which also hosts other sites.
+#  
+#  Examples:
+#  
+#      Explicitly define the default behavior if no ACL and
+#      listen-address are set: "localhost" is OK. The absence of a
+#      dst_addr implies that all destination addresses are OK:
+#  
+#        permit-access  localhost
+#  
+#      Allow any host on the same class C subnet as www.privoxy.org
+#      access to nothing but www.example.com:
+#  
+#        permit-access  www.privoxy.org/24 www.example.com/32
+#  
+#      Allow access from any host on the 26-bit subnet 192.168.45.64
+#      to anywhere, with the exception that 192.168.45.73 may not
+#      access www.dirty-stuff.example.com:
+#  
+#        permit-access  192.168.45.64/26 
+#        deny-access    192.168.45.73     www.dirty-stuff.example.com
+#  
+
+#  
+#  4.6. buffer-limit
+#  =================
+#  
+#  Specifies:
+#  
+#      Maximum size of the buffer for content filtering.
+#  
+#  Type of value:
+#  
+#      Size in Kbytes
+#  
+#  Default value:
+#  
+#      4096
+#  
+#  Effect if unset:
+#  
+#      Use a 4MB (4096 KB) limit.
+#  
+#  Notes:
+#  
+#      For content filtering, i.e. the +filter and +deanimate-gif
+#      actions, it is necessary that Privoxy buffers the entire document
+#      body. This can be potentially dangerous, since a server could
+#      just keep sending data indefinitely and wait for your RAM to
+#      exhaust -- with nasty consequences.  Hence this option.
+#  
+#      When a document buffer size reaches the buffer-limit, it is
+#      flushed to the client unfiltered and no further attempt to filter
+#      the rest of the document is made. Remember that there may be
+#      multiple threads running, which might require up to buffer-limit
+#      Kbytes each, unless you have enabled "single-threaded" above.
+#  
+buffer-limit 4096
+
+#  
+#  5. FORWARDING
+#  =============
+#  
+#  This feature allows routing of HTTP requests through a chain
+#  of multiple proxies. It can be used to better protect privacy
+#  and confidentiality when accessing specific domains by routing
+#  requests to those domains through an anonymous public proxy (see
+#  e.g. http://www.multiproxy.org/anon_list.htm) Or to use a caching
+#  proxy to speed up browsing. Or chaining to a parent proxy may be
+#  necessary because the machine that Privoxy runs on has no direct
+#  Internet access.
+#  
+#  Also specified here are SOCKS proxies. Privoxy supports the SOCKS
+#  4 and SOCKS 4A protocols.
+#  
+
+#  
+#  5.1. forward
+#  ============
+#  
+#  Specifies:
+#  
+#      To which parent HTTP proxy specific requests should be routed.
+#  
+#  Type of value:
+#  
+#      target_pattern http_parent[:port]
+#  
+#      where target_pattern is a URL pattern that specifies to which
+#      requests (i.e. URLs) this forward rule shall apply. Use /
+#      to denote "all URLs".  http_parent[:port] is the DNS name or
+#      IP address of the parent HTTP proxy through which the requests
+#      should be forwarded, optionally followed by its listening port
+#      (default: 8080). Use a single dot (.) to denote "no forwarding".
+#  
+#  Default value:
+#  
+#      Unset
+#  
+#  Effect if unset:
+#  
+#      Don't use parent HTTP proxies.
+#  
+#  Notes:
+#  
+#      If http_parent is ".", then requests are not forwarded to
+#      another HTTP proxy but are made directly to the web servers.
+#  
+#      Multiple lines are OK, they are checked in sequence, and the
+#      last match wins.
+#  
+#  Examples:
+#  
+#      Everything goes to an example anonymizing proxy, except SSL on
+#      port 443 (which it doesn't handle):
+#  
+#        forward   /      anon-proxy.example.org:8080 
+#        forward   :443   .
+#  
+#      Everything goes to our example ISP's caching proxy, except for
+#      requests to that ISP's sites:
+#  
+#        forward   /                  caching-proxy.example-isp.net:8000
+#        forward   .example-isp.net   .
+#  
+
+#  
+#  5.2. forward-socks4 and forward-socks4a
+#  =======================================
+#  
+#  Specifies:
+#  
+#      Through which SOCKS proxy (and to which parent HTTP proxy)
+#      specific requests should be routed.
+#  
+#  Type of value:
+#  
+#      target_pattern socks_proxy[:port] http_parent[:port]
+#  
+#      where target_pattern is a URL pattern that specifies to which
+#      requests (i.e. URLs) this forward rule shall apply. Use / to
+#      denote "all URLs".  http_parent and socks_proxy are IP addresses
+#      in dotted decimal notation or valid DNS names (http_parent may
+#      be "." to denote "no HTTP forwarding"), and the optional port
+#      parameters are TCP ports, i.e. integer values from 1 to 64535
+#  
+#  Default value:
+#  
+#      Unset
+#  
+#  Effect if unset:
+#  
+#      Don't use SOCKS proxies.
+#  
+#  Notes:
+#  
+#      Multiple lines are OK, they are checked in sequence, and the
+#      last match wins.
+#  
+#      The difference between forward-socks4 and forward-socks4a
+#      is that in the SOCKS 4A protocol, the DNS resolution of the
+#      target hostname happens on the SOCKS server, while in SOCKS 4
+#      it happens locally.
+#  
+#      If http_parent is ".", then requests are not forwarded to another
+#      HTTP proxy but are made (HTTP-wise) directly to the web servers,
+#      albeit through a SOCKS proxy.
+#  
+#  Examples:
+#  
+#      From the company example.com, direct connections are made to all
+#      "internal" domains, but everything outbound goes through their
+#      ISP's proxy by way of example.com's corporate SOCKS 4A gateway
+#      to the Internet.
+#  
+#        forward-socks4a   /              socks-gw.example.com:1080   www-cache.example-isp.net:8080 
+#        forward           .example.com   .
+#  
+#      A rule that uses a SOCKS 4 gateway for all destinations but no
+#      HTTP parent looks like this:
+#  
+#        forward-socks4   /               socks-gw.example.com:1080  .
+#  
+forward-socks4a / localhost:9050 .
+
+#  
+#  6. WINDOWS GUI OPTIONS
+#  ======================
+#  
+#  Privoxy has a number of options specific to the Windows GUI
+#  interface:
+#  
+
+#  If "activity-animation" is set to 1, the Privoxy icon will animate
+#  when "Privoxy" is active. To turn off, set to 0.
+#  
+#activity-animation   1
+
+#  If "log-messages" is set to 1, Privoxy will log messages to the
+#  console window:
+#  
+log-messages  0 
+
+#  If "log-buffer-size" is set to 1, the size of the log buffer,
+#  i.e. the amount of memory used for the log messages displayed in
+#  the console window, will be limited to "log-max-lines" (see below).
+#  
+#  Warning: Setting this to 0 will result in the buffer to grow
+#  infinitely and eat up all your memory!
+#  
+#log-buffer-size 1
+
+#  log-max-lines is the maximum number of lines held in the log
+#  buffer. See above.
+#  
+#log-max-lines 200
+
+#  If "log-highlight-messages" is set to 1, Privoxy will highlight
+#  portions of the log messages with a bold-faced font:
+#  
+#log-highlight-messages 1
+
+#  The font used in the console window:
+#  
+#log-font-name Comic Sans MS
+
+#  Font size used in the console window:
+#  
+#log-font-size 8
+
+#  "show-on-task-bar" controls whether or not Privoxy will appear as
+#  a button on the Task bar when minimized:
+#  
+#show-on-task-bar 0
+
+#  If "close-button-minimizes" is set to 1, the Windows close button
+#  will minimize Privoxy instead of closing the program (close with
+#  the exit option on the File menu).
+#  
+#close-button-minimizes 1
+
+#  The "hide-console" option is specific to the MS-Win console version
+#  of Privoxy.  If this option is used, Privoxy will disconnect from
+#  and hide the command console.
+#  
+#hide-console
+
+#