[or-cvs] r13417: Merge in trunk changes we want (in torbrowser/branches/stable: . www)

[sjm217@xxxxxxxx]

Author: sjm217
Date: 2008-02-08 09:58:56 -0500 (Fri, 08 Feb 2008)
New Revision: 13417

Modified:
   torbrowser/branches/stable/README
   torbrowser/branches/stable/TODO
   torbrowser/branches/stable/www/details.html
   torbrowser/branches/stable/www/index.html
   torbrowser/branches/stable/www/screenshot2.png
Log:
Merge in trunk changes we want

Modified: torbrowser/branches/stable/README
===================================================================
--- torbrowser/branches/stable/README	2008-02-08 14:53:15 UTC (rev 13416)
+++ torbrowser/branches/stable/README	2008-02-08 14:58:56 UTC (rev 13417)
@@ -41,6 +41,7 @@
 
 Vidalia (svn trunk revision 2337)
 Tor 0.2.0.18-alpha (with libevent-1.3e, zlib-1.2.3 and openssl-0.9.8g) 
+Polipo 1.0.4
 FirefoxPortable 2.0.0.11
  \_ Firefox 2.0.0.11
     \_ Torbutton 1.1.12-alpha

Modified: torbrowser/branches/stable/TODO
===================================================================
--- torbrowser/branches/stable/TODO	2008-02-08 14:53:15 UTC (rev 13416)
+++ torbrowser/branches/stable/TODO	2008-02-08 14:58:56 UTC (rev 13417)
@@ -6,14 +6,13 @@
 Vidalia modifications
 ---------------------
 
-- Make Vidalia start and stop Polipo too
-[high priority]
-
 - Make Vidalia show some evidence of activity while it is starting Tor
 [mid priority -- what do you have in mind here?]
 
 - Prevent user from starting Firefox manually while Tor is still
   starting up
+  OR (preferably)
+- Allow normal Firefox and Tor Browser to co-exist safely
 [mid priority]
 
 - Also make Vidalia show what percentage progress Tor has made in
@@ -96,6 +95,9 @@
 
 - Make it easier to include optional Firefox extensions
 
+- Split archive or make auto-downloader to help people who cannot
+  download large files in one go
+
 Questions
 =========
 
@@ -105,6 +107,10 @@
 Done
 ====
 
+[ Done: 2008-01-30 ]
+- Make Vidalia start and stop Polipo too
+[high priority]
+
 [ Done: 2008-01-22 ]
 - Make a web page for bundle
 

Modified: torbrowser/branches/stable/www/details.html
===================================================================
--- torbrowser/branches/stable/www/details.html	2008-02-08 14:53:15 UTC (rev 13416)
+++ torbrowser/branches/stable/www/details.html	2008-02-08 14:58:56 UTC (rev 13417)
@@ -25,16 +25,17 @@
 <h3 id="contents">Bundle contents</h3>
 
 <ul>
-<li>Vidalia (svn trunk revision 2213)</li>
-<li>Tor 0.2.0.12-alpha (with libevent-1.3e, zlib-1.2.3 and
+<li>Vidalia (svn trunk revision 2337)</li>
+<li>Tor 0.2.0.18-alpha (with libevent-1.3e, zlib-1.2.3 and
 openssl-0.9.8g)</li>
 <li>FirefoxPortable 2.0.0.11 (includes Firefox 2.0.0.11 and Torbutton
 1.1.12-alpha)</li>
+<li>Polipo 1.0.4</li>
 </ul>
 
 <h3 id="build">Building the bundle</h3>
 
-<p>To re-build the bundle, download the <a href="dist/tor-browser-0.0.5-src.tar.gz">source distribution</a> (<a href="dist/tor-browser-0.0.5-src.tar.gz.asc">signature</a>). See <a href="https://tor-svn.freehaven.net/svn/torbrowser/trunk/README";>README</a> for the directory layout and changelog</a>. Build instructions can be found in <a href="https://tor-svn.freehaven.net/svn/torbrowser/trunk/build-scripts/INSTALL";>build-scripts/INSTALL</a>.</p>
+<p>To re-build the bundle, download the <a href="dist/tor-browser-0.0.6-src.tar.gz">source distribution</a> (<a href="dist/tor-browser-0.0.6-src.tar.gz.asc">signature</a>). See <a href="https://tor-svn.freehaven.net/svn/torbrowser/trunk/README";>README</a> for the directory layout and changelog</a>. Build instructions can be found in <a href="https://tor-svn.freehaven.net/svn/torbrowser/trunk/build-scripts/INSTALL";>build-scripts/INSTALL</a>.</p>
 
 </div><!-- #main -->
 </div>

Modified: torbrowser/branches/stable/www/index.html
===================================================================
--- torbrowser/branches/stable/www/index.html	2008-02-08 14:53:15 UTC (rev 13416)
+++ torbrowser/branches/stable/www/index.html	2008-02-08 14:58:56 UTC (rev 13417)
@@ -24,8 +24,8 @@
 
 <h3>Download</h3>
 
-<p style="font-size: 120%; margin: 5mm"><a href="dist/tor-browser-0.0.5_en.exe">Tor Browser Bundle for Windows</a> (version 0.0.5, English,
-13 MB) (<a href="dist/tor-browser-0.0.5_en.exe.asc">signature</a>)</p>
+<p style="font-size: 120%; margin: 5mm"><a href="dist/tor-browser-0.0.6_en.exe">Tor Browser Bundle for Windows</a> (version 0.0.6, English,
+13 MB) (<a href="dist/tor-browser-0.0.6_en.exe.asc">signature</a>)</p>
 
 <h3>Extraction</h3>
 

Modified: torbrowser/branches/stable/www/screenshot2.png
===================================================================
(Binary files differ)