[or-cvs] r13332: Prepare for 0.0.6 release: Configure Firefox and Vidalia to (in torbrowser/trunk: . build-scripts build-scripts/config)
sjm217 at seul.org
sjm217 at seul.org
Tue Jan 29 23:29:07 UTC 2008
Author: sjm217
Date: 2008-01-29 18:29:06 -0500 (Tue, 29 Jan 2008)
New Revision: 13332
Modified:
torbrowser/trunk/README
torbrowser/trunk/build-scripts/INSTALL
torbrowser/trunk/build-scripts/Makefile
torbrowser/trunk/build-scripts/config/prefs.js
torbrowser/trunk/build-scripts/config/vidalia.conf
Log:
Prepare for 0.0.6 release:
Configure Firefox and Vidalia to use Polipo
Update version numbers in README/Makefile/INSTALL
Update Changelog in README
Modified: torbrowser/trunk/README
===================================================================
--- torbrowser/trunk/README 2008-01-29 18:00:54 UTC (rev 13331)
+++ torbrowser/trunk/README 2008-01-29 23:29:06 UTC (rev 13332)
@@ -39,8 +39,8 @@
Included applications
---------------------
-Vidalia (svn trunk revision 2213)
-Tor 0.2.0.12-alpha (with libevent-1.3e, zlib-1.2.3 and openssl-0.9.8g)
+Vidalia (svn trunk revision 2337)
+Tor 0.2.0.18-alpha (with libevent-1.3e, zlib-1.2.3 and openssl-0.9.8g)
FirefoxPortable 2.0.0.11
\_ Firefox 2.0.0.11
\_ Torbutton 1.1.12-alpha
@@ -87,6 +87,10 @@
- Sanitize cookies and passwords on shutdown
- Prevent scripts calling plugins
- Empty add-on installation whitelist
-0.0.6: Released 2008-01-xx
+0.0.6: Released 2008-01-29
Rename start file "Start Tor Browser" so as to be easier to explain
Location of wget is now a configurable parameter
+ Vidalia updated to r2337 (for ProxyExecutable(Arguments) options
+ Tor updated to 0.2.0.18-alpha
+ Polipo 1.0.4 now included in bundle and Firefox configured
+ Firefox now configured to use proxies at 127.0.0.1 to prevent IPv6 attempt
Modified: torbrowser/trunk/build-scripts/INSTALL
===================================================================
--- torbrowser/trunk/build-scripts/INSTALL 2008-01-29 18:00:54 UTC (rev 13331)
+++ torbrowser/trunk/build-scripts/INSTALL 2008-01-29 23:29:06 UTC (rev 13332)
@@ -32,9 +32,9 @@
To compress the bundle and build the self-extracting executable you
need to have installed 7zip.
-Vidalia needs to have the BrowserExecutable and ProxyExecutable
-options. Currently this is only available in the Vidalia trunk
-revision 2324 and later.
+Vidalia needs to have the BrowserExecutable, ProxyExecutable and
+ProxyExecutableArguments options. Currently this is only available in
+the Vidalia trunk revision 2328 and later.
FirefoxPortable can be downloaded from:
http://portableapps.com/apps/internet/firefox_portable
Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile 2008-01-29 18:00:54 UTC (rev 13331)
+++ torbrowser/trunk/build-scripts/Makefile 2008-01-29 23:29:06 UTC (rev 13332)
@@ -13,13 +13,13 @@
## Location of bundle components
VIDALIA=/c/build/vidalia
-TOR=/c/build/tor-0.2.0.12-alpha
+TOR=/c/build/tor-0.2.0.18-alpha
POLIPO=/c/build/polipo-1.0.4
FIREFOX_SRC="FirefoxPortable"
## Location of utility applications
SEVENZIP="/c/Program Files/7-Zip/7z.exe"
-WGET="/c/Python25/python.exe /c/build/torbrowser/build-scripts/pyget.py"
+WGET=/c/Python25/python.exe /c/build/torbrowser/build-scripts/pyget.py
## Location of config files
CONFIG_SRC=config
@@ -55,7 +55,7 @@
mkdir -p $(DOCS)/mingw
mkdir -p $(DOCS)/polipo
cp $(VIDALIA)/LICENSE $(VIDALIA)/COPYING $(VIDALIA)/AUTHORS $(QT)/../LICENSE.GPL $(DOCS)/vidalia
- cp $(TOR)/LICENSE $(TOR)/AUTHORS $(DOCS)/tor
+ cp $(TOR)/LICENSE $(TOR)/AUTHORS $(TOR)/README $(DOCS)/tor
cp $(QT)/../LICENSE.GPL $(DOCS)/qt
cp $(MING)/../COPYING $(DOCS)/mingw
cp $(POLIPO)/COPYING $(POLIPO)/README $(DOCS)/polipo
@@ -167,7 +167,7 @@
rm -f "Tor Browser.exe"
## Export the source code of the bundle
-SRCVERSION=0.0.5
+SRCVERSION=0.0.6
SRCNAME=tor-browser-$(SRCVERSION)
SRCDEST=/tmp
SRCDESTPATH=$(SRCDEST)/$(SRCNAME)
Modified: torbrowser/trunk/build-scripts/config/prefs.js
===================================================================
--- torbrowser/trunk/build-scripts/config/prefs.js 2008-01-29 18:00:54 UTC (rev 13331)
+++ torbrowser/trunk/build-scripts/config/prefs.js 2008-01-29 23:29:06 UTC (rev 13332)
@@ -31,14 +31,27 @@
user_pref("browser.startup.homepage_override.mstone", "rv:1.8.1.11");
user_pref("dom.storage.enabled", false);
user_pref("extensions.lastAppVersion", "2.0.0.11");
+user_pref("extensions.torbutton.custom.http_port", 8118);
+user_pref("extensions.torbutton.custom.http_proxy", "127.0.0.1");
+user_pref("extensions.torbutton.custom.https_port", 8118);
+user_pref("extensions.torbutton.custom.https_proxy", "127.0.0.1");
user_pref("extensions.torbutton.custom.socks_host", "localhost");
user_pref("extensions.torbutton.custom.socks_port", 9050);
+user_pref("extensions.torbutton.http_port", 8118);
+user_pref("extensions.torbutton.http_proxy", "127.0.0.1");
+user_pref("extensions.torbutton.https_port", 8118);
+user_pref("extensions.torbutton.https_proxy", "127.0.0.1");
+user_pref("extensions.torbutton.saved.http_port", 8118);
+user_pref("extensions.torbutton.saved.http_proxy", "127.0.0.1");
+user_pref("extensions.torbutton.saved.https_port", 8118);
+user_pref("extensions.torbutton.saved.https_proxy", "127.0.0.1");
user_pref("extensions.torbutton.saved.share_proxy_settings", false);
-user_pref("extensions.torbutton.saved.socks_host", "localhost");
+user_pref("extensions.torbutton.saved.socks_host", "127.0.0.1");
user_pref("extensions.torbutton.saved.socks_port", 9050);
user_pref("extensions.torbutton.saved.socks_remote_dns", true);
user_pref("extensions.torbutton.saved.socks_version", 5);
user_pref("extensions.torbutton.saved.type", 1);
+user_pref("extensions.torbutton.settings_method", "custom");
user_pref("extensions.torbutton.socks_host", "localhost");
user_pref("extensions.torbutton.socks_port", 9050);
user_pref("extensions.torbutton.tor_enabled", true);
@@ -64,10 +77,14 @@
user_pref("network.protocol-handler.external.nntp", false);
user_pref("network.protocol-handler.external.snews", false);
user_pref("network.proxy.failover_timeout", 0);
-user_pref("network.proxy.no_proxies_on", "");
+user_pref("network.proxy.http", "127.0.0.1");
+user_pref("network.proxy.http_port", 8118);
+user_pref("network.proxy.no_proxies_on", "127.0.0.1");
user_pref("network.proxy.socks", "localhost");
user_pref("network.proxy.socks_port", 9050);
user_pref("network.proxy.socks_remote_dns", true);
+user_pref("network.proxy.ssl", "127.0.0.1");
+user_pref("network.proxy.ssl_port", 8118);
user_pref("network.proxy.type", 1);
user_pref("privacy.item.cookies", true);
user_pref("privacy.item.passwords", true);
Modified: torbrowser/trunk/build-scripts/config/vidalia.conf
===================================================================
--- torbrowser/trunk/build-scripts/config/vidalia.conf 2008-01-29 18:00:54 UTC (rev 13331)
+++ torbrowser/trunk/build-scripts/config/vidalia.conf 2008-01-29 23:29:06 UTC (rev 13332)
@@ -1,6 +1,8 @@
[General]
-BrowserExecutable=.\\FirefoxPortable\\FirefoxPortable.exe
+BrowserExecutable=FirefoxPortable\\FirefoxPortable.exe
LanguageCode=en
+ProxyExecutable=App\\polipo.exe
+ProxyExecutableArguments=-c, Data\\Polipo\\polipo.conf
[Tor]
ControlPort=9051
More information about the tor-commits
mailing list