[or-cvs] r14018: Fix polipo.conf errors (thanks Phillip) Update Makefile for (in torbrowser/trunk/build-scripts: . config)

[sjm217 at seul.org]

Author: sjm217
Date: 2008-03-13 19:30:28 -0400 (Thu, 13 Mar 2008)
New Revision: 14018

Modified:
   torbrowser/trunk/build-scripts/Makefile
   torbrowser/trunk/build-scripts/config/polipo.conf
Log:
Fix polipo.conf errors (thanks Phillip)
Update Makefile for new location of Vidalia license files

Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile	2008-03-13 22:58:51 UTC (rev 14017)
+++ torbrowser/trunk/build-scripts/Makefile	2008-03-13 23:30:28 UTC (rev 14018)
@@ -124,7 +124,7 @@
 	mkdir -p $(DOCSDIR)/Qt
 	mkdir -p $(DOCSDIR)/MinGW
 	mkdir -p $(DOCSDIR)/Polipo
-	cp $(VIDALIA)/LICENSE $(VIDALIA)/COPYING $(VIDALIA)/AUTHORS $(QT)/../LICENSE.GPL $(DOCSDIR)/Vidalia
+	cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(QT)/../LICENSE.GPL $(DOCSDIR)/Vidalia
 	cp $(TOR)/LICENSE $(TOR)/AUTHORS $(TOR)/README $(DOCSDIR)/Tor
 	cp $(QT)/../LICENSE.GPL $(DOCSDIR)/Qt
 	cp $(MING)/../COPYING $(DOCSDIR)/MinGW

Modified: torbrowser/trunk/build-scripts/config/polipo.conf
===================================================================
--- torbrowser/trunk/build-scripts/config/polipo.conf	2008-03-13 22:58:51 UTC (rev 14017)
+++ torbrowser/trunk/build-scripts/config/polipo.conf	2008-03-13 23:30:28 UTC (rev 14018)
@@ -7,7 +7,7 @@
 # proxyAddress = "::0"        # both IPv4 and IPv6
 # proxyAddress = "0.0.0.0"    # IPv4 only
 
-proxyAddress "127.0.0.1"
+proxyAddress = "127.0.0.1"
 proxyPort = 8118
 
 # If you do that, you'll want to restrict the set of hosts allowed to
@@ -85,14 +85,14 @@
 
 # Uncomment this if you want to contact IPv4 hosts only (and make DNS
 # queries somewhat faster):
+#
+# dnsQueryIPv6 = no
 
-dnsQueryIPv6 = no
-
 # Uncomment this if you want Polipo to prefer IPv4 to IPv6 for
 # double-stack hosts:
+#
+# dnsQueryIPv6 = reluctantly
 
-dnsQueryIPv6 = reluctantly
-
 # Uncomment this to disable Polipo's DNS resolver and use the system's
 # default resolver instead.  If you do that, Polipo will freeze during
 # every DNS query: