[or-cvs] r19343: {torbrowser} Merge of trunk to alt-launcher feature branch (r18323-r19313 (in torbrowser/branches/altlauncher/build-scripts: . config)

sjm217 at seul.org sjm217 at seul.org
Fri Apr 17 14:29:54 UTC 2009 

Author: sjm217
Date: 2009-04-17 10:29:54 -0400 (Fri, 17 Apr 2009)
New Revision: 19343

Modified:
   torbrowser/branches/altlauncher/build-scripts/DEPLOYMENT
   torbrowser/branches/altlauncher/build-scripts/INSTALL
   torbrowser/branches/altlauncher/build-scripts/Makefile
   torbrowser/branches/altlauncher/build-scripts/config/bookmarks.html
   torbrowser/branches/altlauncher/build-scripts/config/prefs.js
   torbrowser/branches/altlauncher/build-scripts/patch-vidalia-language.sh
Log:
Merge of trunk to alt-launcher feature branch (r18323-r19313)

Modified: torbrowser/branches/altlauncher/build-scripts/DEPLOYMENT
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/DEPLOYMENT	2009-04-17 14:09:29 UTC (rev 19342)
+++ torbrowser/branches/altlauncher/build-scripts/DEPLOYMENT	2009-04-17 14:29:54 UTC (rev 19343)
@@ -117,13 +117,13 @@
 Upload to www.torproject.org
 ============================
 
+Make sure they have the right permissions:
+ find . -type f -exec chmod 444 {} \;
+ find . -type d -exec chmod 775 {} \;
+
 Copy the files, along with their signatures to:
  www.torproject.org:/var/www/www.torproject.org/htdocs/torbrowser/dist
 
-Make sure they have the right permissions:
- find /var/www/www.torproject.org/htdocs/torbrowser/dist -type f -exec chmod 444 {} \;
- find /var/www/www.torproject.org/htdocs/torbrowser/dist -type d -exec chmod 775 {} \;
-
 Update the website
 ==================
 

Modified: torbrowser/branches/altlauncher/build-scripts/INSTALL
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/INSTALL	2009-04-17 14:09:29 UTC (rev 19342)
+++ torbrowser/branches/altlauncher/build-scripts/INSTALL	2009-04-17 14:29:54 UTC (rev 19343)
@@ -208,9 +208,9 @@
 
     http://cmake.org/
 
-Download version 2.6.0:
+Download version 2.6.2:
 
-    http://www.cmake.org/files/v2.6/cmake-2.6.0-win32-x86.exe
+    http://www.cmake.org/files/v2.6/cmake-2.6.2-win32-x86.exe
 
 Run the installer with Windows Explorer and install into:
     
@@ -219,15 +219,15 @@
 Installing Qt
 =============
 
-Download Qt 4.1 or later, we'll use 4.3.5:
+Download Qt 4.1 or later, we'll use 4.5.0:
 
     http://trolltech.com/developer/downloads/qt/windows
 
 Download and run the installer with Windows Explorer:
 
-    ftp://ftp.trolltech.com/qt/source/qt-win-opensource-4.3.5-mingw.exe
+    ftp://ftp.trolltech.com/qt/source/qt-win-opensource-4.5.0-mingw.exe
 
-When prompted, install Qt into 'C:\Qt\4.3.5'
+When prompted, install Qt into 'C:\Qt\4.5.0'
 You will be prompted for the install path for your MinGW directory, enter 'C:\MinGW'
 You may have an error about win32api.h being not found. This is not true. You
 have win32api.h and Qt is wrong.  This is a result of the Qt installer not
@@ -334,23 +334,23 @@
 
 Download openssl:
 
-    http://www.openssl.org/source/openssl-0.9.8h.tar.gz
+    http://www.openssl.org/source/openssl-0.9.8k.tar.gz
 
 Unpack it:
 
     cd /c/build/
-    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/openssl-0.9.8h.tar.gz
+    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/openssl-0.9.8k.tar.gz
 
 You should see errors not unlike:
 
-    tar: openssl-0.9.8h/include/openssl/bn.h: Cannot create symlink to `../../crypto/bn/bn.h': No such file or directory
-    tar: openssl-0.9.8h/include/openssl/blowfish.h: Cannot create symlink to `../../crypto/bf/blowfish.h': No such file or directory
-    tar: openssl-0.9.8h/include/openssl/bio.h: Cannot create symlink to `../../crypto/bio/bio.h': No such file or directory
-    tar: openssl-0.9.8h/include/openssl/asn1t.h: Cannot create symlink to `../../crypto/asn1/asn1t.h': No such file or directory
-    tar: openssl-0.9.8h/include/openssl/asn1_mac.h: Cannot create symlink to `../../crypto/asn1/asn1_mac.h': No such file or directory
-    tar: openssl-0.9.8h/include/openssl/asn1.h: Cannot create symlink to `../../crypto/asn1/asn1.h': No such file or directory
-    tar: openssl-0.9.8h/include/openssl/aes.h: Cannot create symlink to `../../crypto/aes/aes.h': No such file or directory
-    tar: openssl-0.9.8h/apps/md4.c: Cannot create symlink to `../crypto/md4/md4.c': No such file or directory
+    tar: openssl-0.9.8k/include/openssl/bn.h: Cannot create symlink to `../../crypto/bn/bn.h': No such file or directory
+    tar: openssl-0.9.8k/include/openssl/blowfish.h: Cannot create symlink to `../../crypto/bf/blowfish.h': No such file or directory
+    tar: openssl-0.9.8k/include/openssl/bio.h: Cannot create symlink to `../../crypto/bio/bio.h': No such file or directory
+    tar: openssl-0.9.8k/include/openssl/asn1t.h: Cannot create symlink to `../../crypto/asn1/asn1t.h': No such file or directory
+    tar: openssl-0.9.8k/include/openssl/asn1_mac.h: Cannot create symlink to `../../crypto/asn1/asn1_mac.h': No such file or directory
+    tar: openssl-0.9.8k/include/openssl/asn1.h: Cannot create symlink to `../../crypto/asn1/asn1.h': No such file or directory
+    tar: openssl-0.9.8k/include/openssl/aes.h: Cannot create symlink to `../../crypto/aes/aes.h': No such file or directory
+    tar: openssl-0.9.8k/apps/md4.c: Cannot create symlink to `../crypto/md4/md4.c': No such file or directory
     tar: Error exit delayed from previous errors
 
 Uncompressing OpenSSL shows a number of errors concerning symlinks. These do
@@ -358,10 +358,10 @@
 
 Now configure the source package:
 
-    cd openssl-0.9.8h/
+    cd openssl-0.9.8k/
     ./config -no-idea -no-rc5 -no-mdc2
 
-Edit '/c/build/openssl-0.9.8h/Makefile' and remove the "test:" and "tests:" sections that follow:
+Edit '/c/build/openssl-0.9.8k/Makefile' and remove the "test:" and "tests:" sections that follow:
 
     test:   tests
 
@@ -383,6 +383,7 @@
         find ./ -name "*.h" -exec cp {} ../include/openssl/ \;
         cd ..
         cp *.h include/openssl/
+        cp fips/fips.h include/openssl/
 
 And finally, build it - this can take a long time and depends on the speed of your computer:
 
@@ -392,19 +393,19 @@
 Building libevent
 =================
 
-Next, you'll want to download, unpack, build and install libevent ( Version: libevent-1.3e ).
+Next, you'll want to download, unpack, build and install libevent ( Version: libevent-1.4.9 ).
 You can get libevent here:
 
         http://www.monkey.org/~provos/libevent/
-        http://www.monkey.org/~provos/libevent-1.3e.tar.gz
-        http://www.monkey.org/~provos/libevent-1.3e.tar.gz.sig
+        http://www.monkey.org/~provos/libevent-1.4.9-stable.tar.gz
+        http://www.monkey.org/~provos/libevent-1.4.9-stable.tar.gz.sig
 
 Verify the signature.
 
 Unpack it:
 
-    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/libevent-1.3e.tar.gz
-    cd libevent-1.3e/
+    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/libevent-1.4.9-stable.tar.gz
+    cd libevent-1.4.9-stable/
 
 Configure, build and install:
 
@@ -417,11 +418,11 @@
 
 Download, unpack, build and install Tor:
         https://www.torproject.org/download.html
-        https://www.torproject.org/dist/tor-0.2.1.8-alpha.tar.gz
-        https://www.torproject.org/dist/tor-0.2.1.8-alpha.gz.asc
+        https://www.torproject.org/dist/tor-0.2.1.13-alpha.tar.gz
+        https://www.torproject.org/dist/tor-0.2.1.13-alpha.gz.asc
         $ cd /c/build/
-        tar -C /c/build -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/tor-0.2.1.8-alpha.tar.gz
-        $ cd tor-0.2.1.8-alpha/
+        tar -C /c/build -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/tor-0.2.1.13-alpha.tar.gz
+        $ cd tor-0.2.1.13-alpha/
         ./configure
         make
 
@@ -433,26 +434,26 @@
 
 Download Vidalia:
 
-    http://vidalia-project.net/dist/vidalia-0.1.10.tar.gz
-    http://vidalia-project.net/dist/vidalia-0.1.10.tar.gz.asc
+    http://vidalia-project.net/dist/vidalia-0.1.12.tar.gz
+    http://vidalia-project.net/dist/vidalia-0.1.12.tar.gz.asc
 
 Verify the signature.
 
 Unpack Vidalia:
    
-    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/vidalia-0.1.10.tar.gz
-    mv vidalia-0.1.10/ vidalia
+    tar -C /c/build/ -xvzf /c/Documents\ and\ Settings/Administrator/Desktop/vidalia-0.1.12.tar.gz
+    mv vidalia-0.1.12/ vidalia
 
 Set a proper environment:
 
     cat << 'EOF' >> /etc/profile
-    export QTDIR="C:\Qt\4.3.5"
-    export PATH=$PATH:/c/Qt/4.3.5/bin
+    export QTDIR="C:\Qt\4.5.0"
+    export PATH=$PATH:/c/Qt/4.5.0/bin
     export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/
     export QMAKESPEC=win32-g++
     EOF
 
-    export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/:/c/MinGW/bin/:/c/Qt/4.3.5/bin/
+    export PATH=$PATH:/c/Program\ Files/CMake\ 2.6/bin/:/c/MinGW/bin/:/c/Qt/4.5.0/bin/
 
 Create the proper MSYS Makefiles and don't forget the '.' at the end!
 
@@ -480,7 +481,7 @@
 
       and other libraries with known full path:
 
-        C:/Qt/4.3.5/lib/libQtGui4.a
+        C:/Qt/4.5.0/lib/libQtGui4.a
 
 
       CMake is adding directories in the second list to the linker search path in
@@ -495,24 +496,6 @@
 
 This is OK. You can ignore these errors.
 
-It appears that for whatever reason, Qt now requires a small patch to compile
-Vidalia. We've created a small patch that will allow the build to function.
-
-Download the patch:
-
-    https://svn.torproject.org/svn/torbrowser/trunk/src/current-patches/qt-interlock-fix.patch
-
-Copy the patch to your build directory:
-
-    cp /c/Documents\ and\ Settings/Administrator/Desktop/qt-interlock-fix.patch /c/build/
-
-Apply it like so:
-
-    cd /c/Qt/4.3.5/src/corelib/arch
-    patch -p0 < /c/build/qt-interlock-fix.patch
-
-This patch is very simple and should no longer be required in Qt 4.4.4
-
 Now you'll build Vidalia by running MSYS make:
 
     cd /c/build/vidalia/
@@ -568,7 +551,7 @@
 
 Download FirefoxPortable:
 
-    http://downloads.sourceforge.net/portableapps/Firefox_Portable_2.0.0.18_en-us.paf.exe?download
+    http://downloads.sourceforge.net/portableapps/Firefox_Portable_3.0.8_en-us.paf.exe?download
 
 Run the installer and select it into: 'C:\build\FirefoxPortable-<version>>'
 
@@ -645,12 +628,12 @@
 An example to change the Qt Lib version:
 
         From: QT=/c/Qt/4.3.4/bin
-        To: QT=/c/Qt/4.3.5/bin
+        To: QT=/c/Qt/4.5.0/bin
 
 And then change the Tor version:
 
         From: TOR=/c/build/tor-0.2.0.26-rc
-        To: TOR=/c/build/tor-0.2.1.8-alpha
+        To: TOR=/c/build/tor-0.2.1.13-alpha
 
 Now you can run "make bundle_LANGUAGE", e.g. "make bundle_en-US".
 
@@ -664,6 +647,7 @@
  - es-ES
  - fa-IR
  - fr
+ - it
  - nl
  - pt-PT
  - ru

Modified: torbrowser/branches/altlauncher/build-scripts/Makefile
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/Makefile	2009-04-17 14:09:29 UTC (rev 19342)
+++ torbrowser/branches/altlauncher/build-scripts/Makefile	2009-04-17 14:29:54 UTC (rev 19343)
@@ -13,14 +13,14 @@
 
 ## Location of required libraries
 MING=/c/MinGW/bin
-QT=/c/Qt/4.3.5/bin
+QT=/c/Qt/4.5.0/bin
 
 ## Location of bundle components
-VIDALIA=/c/build/vidalia-0.1
-TOR=/c/build/tor-0.2.1.11-alpha
+VIDALIA=/c/build/vidalia-0.1.12
+TOR=/c/build/tor-0.2.1.14-rc
 POLIPO=/c/build/polipo-1.0.4
-FIREFOX_SRC=/c/build/FirefoxPortable-3.0.5
-PIDGIN_SRC=/c/build/PidginPortable-2.5.4
+FIREFOX_SRC=/c/build/FirefoxPortable-3.0.8
+PIDGIN_SRC=/c/build/PidginPortable-2.5.5
 
 ## Location of utility applications
 SEVENZIP="/c/Program Files/7-Zip/7z.exe"
@@ -40,7 +40,7 @@
 NAME="Tor Browser"
 
 ## Version and name of the compressed bundle (also used for source)
-VERSION=1.2.0-rc4
+VERSION=1.2.0-rc5
 DEFAULT_COMPRESSED_BASENAME=tor-browser-
 IM_COMPRESSED_BASENAME=tor-im-browser-
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)
@@ -56,13 +56,13 @@
 DEFAULT_EXTENSIONS=torbutton.xpi
 
 ## Where to download Torbutton from
-TORBUTTON=https://addons.mozilla.org/en-US/firefox/downloads/file/34698/torbutton-1.2.0-fx.xpi
+TORBUTTON=https://addons.mozilla.org/en-US/firefox/downloads/file/34698/torbutton-1.2.1-fx.xpi
 
 ## Where to download Mozilla language packs
-MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.5/win32/xpi
+MOZILLA_LANGUAGE=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.8/win32/xpi
 
 ## Where Farsi Language Pack can be downloaded from
-FA_LANGPACK=https://addons.mozilla.org/en-US/firefox/downloads/file/31181/persian_language_pack-3.0.2-fx.xpi
+FA_LANGPACK=https://addons.mozilla.org/en-US/firefox/downloads/file/31181/persian_language_pack-3.0.8-fx.xpi
 
 ## Put more extensions here
 EXTENSIONS_DIR=extensions
@@ -94,7 +94,8 @@
 	compressed-bundle_nl \
 	compressed-bundle_pt-PT \
 	compressed-bundle_ru \
-	compressed-bundle_zh-CN
+	compressed-bundle_zh-CN \
+	compressed-bundle_it
 
 all-split-bundles: split-bundle_ar \
 	split-bundle_en-US \
@@ -105,7 +106,8 @@
 	split-bundle_nl \
 	split-bundle_pt-PT \
 	split-bundle_ru \
-	split-bundle_zh-CN
+	split-bundle_zh-CN \
+	split-bundle_it
 
 ##
 ## Cleanup
@@ -170,7 +172,7 @@
 	mkdir -p $(DOCSDIR)/Polipo
 	cp $(VIDALIA)/LICENSE* $(VIDALIA)/CREDITS $(DOCSDIR)/Vidalia
 	cp $(TOR)/LICENSE $(TOR)/AUTHORS $(TOR)/README $(DOCSDIR)/Tor
-	cp $(QT)/../LICENSE.GPL* $(QT)/../GPL* $(DOCSDIR)/Qt
+	cp $(QT)/../LICENSE.GPL* $(QT)/../LICENSE.LGPL $(DOCSDIR)/Qt
 	cp $(MING)/../COPYING $(DOCSDIR)/MinGW
 	cp $(POLIPO)/COPYING  $(POLIPO)/README $(DOCSDIR)/Polipo
 

Modified: torbrowser/branches/altlauncher/build-scripts/config/bookmarks.html
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/config/bookmarks.html	2009-04-17 14:09:29 UTC (rev 19342)
+++ torbrowser/branches/altlauncher/build-scripts/config/bookmarks.html	2009-04-17 14:29:54 UTC (rev 19343)
@@ -11,7 +11,6 @@
 <DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
     <DL><p>
         <DT><A HREF="https://www.torproject.org/" ADD_DATE="1197503328" LAST_VISIT="1197503334" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">About Tor</A>
-        <DT><A HREF="http://624eb2rznzhtq2cz.onion/" ADD_DATE="1197503468" LAST_VISIT="1197503474" LAST_MODIFIED="1197503496" LAST_CHARSET="UTF-8" ID="rdf:#$1gnTO1">Tor hidden wiki</A>
         <DT><A HREF="https://torcheck.xenobite.eu/" ADD_DATE="1197503547" LAST_VISIT="1197503551" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADc3Nz/rrGs/8PPvf/P3Mj/xtS+/7bWpf+YxYH/c51c/2KnPf9DcCn/Kzog/yEiG/9HRh7/TU4p/1JTQf+IiIf/OVso/22nT/93oGH/bplX/4K4Zv92ulP/XYtE/2KtO/9epzn/VII7/1F3O/9eYlT/dGpc/zQ3Af80NwH/LS4E/zeaBf8vZxD/OosR/zZ+Ef/CqbL/tY+h/8Oks/+zjJ//v5+u/8equP+4k6X/uJKk/7aYpP80OQH/NDoB/0NHFP8nbQL/MY8C/yVlA/81mQL/grli/2CuOP9UjDj/XK00/4uucP94ll7/XJ45/05qPf9CWzP/LS8B/zQ+Af9DShT/JmoD/zKRAv9Whjz/oc6L/6LPjP9yt1D/Pnse/47FdP+82K7/iqt3/0yfIf9edVD/l6eN/5maif9QXCX/N0MF/zOTAf8wiwL/z9DN/6Buhv+ea4T/6OLk/9jd2P+gp6v/foWK/4x0gP/V1dL/59/k/55rhP+vhZn/s7mh/zRFAf80mQH/NJkB/9rk1P97NVb/ezRV/+PW3f+brbD/sM7R/5u0uP9hP1L/c0Vb/+HU2/97NFX/j1Rw/7rBqf80SgH/NJkB/zSZAf/b6NT/ezVW/3s0Vf/JvMT/qcXJ/7vb3/+lv8X/c15v/4JIZP+/srr/ezRV/49Ub//DyrX/NlEE/zOUAf80mQH/2+jU/3s1Vv97NFX/4dTb/5+0t/+/3+P/rcjN/4x2hv+CXXD/5dzi/3s0Vf+BPl3/18LN/5enfv8scAj/bLVJ/+Xt4P97NVb/ezRV/+XY3//Z2dz/q8DE/7DIzv+ago//z8zO/+Tv3/+QVXH/ezRV/5hhe/+rupj/lcV9/9O8yP+5lKb/ezRV/3s0Vf+uhJn/yKy6/+zq7f+NlZz/3uHc/2mzRP9ekT7/4Nja/6d5j/+0jaD/pbmQ/7XZpf+ldYz/ezRV/3s0Vf97NFX/ezRV/49TcP/y8PP/hLKi/9np4f9trUv/LnsC/0p2Kv+Xr3//oLqJ/0p6Hf+w1p3/yKy7/6t/lP+rf5T/q3+U/6t/lP+6lqj/0+bJ/97u6v+Y1cD/6fLv/3K3UP8qRwL/NncD/zl3B/84dAb/R4om/4fBaf+OxXP/jsVz/47Fc/+OuXT/isNu/0eiGf+pzJf/7vXx//n6+/+u0Zv/SWQj/2OcPf9rn0b/XpQ1/3V2dP82YCD/OpIO/zmbB/83mgX/N5oF/ziSCP89nQz/QpEZ/26sS/+626r/mbuC/7HLn/+92K3/ssqj/4iTgf//////6urq/8DCv/+vxKP/p8yU/6bRkP+r1Zf/udun/8ngvf/c69P/6vTl//P28P/2+vX/9PXz/+zs7P/5+fn/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$2gnTO1">TorCheck at Xenobite.eu - HTTPS-Mode (SSL)</A>
     </DL><p>
     <HR>

Modified: torbrowser/branches/altlauncher/build-scripts/config/prefs.js
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/config/prefs.js	2009-04-17 14:09:29 UTC (rev 19342)
+++ torbrowser/branches/altlauncher/build-scripts/config/prefs.js	2009-04-17 14:29:54 UTC (rev 19343)
@@ -36,9 +36,9 @@
 user_pref("browser.search.update", false);
 user_pref("browser.shell.checkDefaultBrowser", false);
 user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLELOCALE&small=1");
-user_pref("browser.startup.homepage_override.mstone", "rv:1.9.0.5");
+user_pref("browser.startup.homepage_override.mstone", "rv:1.9.0.8");
 user_pref("dom.storage.enabled", false);
-user_pref("extensions.lastAppVersion", "3.0.5");
+user_pref("extensions.lastAppVersion", "3.0.8");
 user_pref("extensions.torbutton.fresh_install", false);
 user_pref("extensions.torbutton.http_port", 8118);
 user_pref("extensions.torbutton.http_proxy", "127.0.0.1");

Modified: torbrowser/branches/altlauncher/build-scripts/patch-vidalia-language.sh
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/patch-vidalia-language.sh	2009-04-17 14:09:29 UTC (rev 19342)
+++ torbrowser/branches/altlauncher/build-scripts/patch-vidalia-language.sh	2009-04-17 14:29:54 UTC (rev 19343)
@@ -23,7 +23,7 @@
     ;;
     'pt-PT') LANGCODE='pt'
     ;;
-    'zh-CN') LANGCODE='zh-cn'
+    'zh-CN') LANGCODE='zh_CN'
     ;;
     *) LANGCODE="$MOZLANG"
     ;;

More information about the tor-commits mailing list