tbb-commits

tbb-commits@lists.torproject.org

1 participants
17589 discussions

[torbutton/master] Dear Turkish Translators: Don't translate the homepage URL, yo.
by mikeperry＠torproject.org 11 Apr '14

11 Apr '14

commit 5393b528462d265b87972bc1279d024b0efb9eb8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 22:35:39 2014 -0700 Dear Turkish Translators: Don't translate the homepage URL, yo. (Or the search engine names, but we'll deal with that later). I fixed this in transifex too, but don't want to wait for transifex to get pulled again. --- src/chrome/locale/tr/browser.properties | 2 +- src/install.rdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/tr/browser.properties b/src/chrome/locale/tr/browser.properties index 55550a3..c30bc36 100644 --- a/src/chrome/locale/tr/browser.properties +++ b/src/chrome/locale/tr/browser.properties @@ -1,5 +1,5 @@ # Default home page -browser.startup.homepage=hakkında:tor +browser.startup.homepage=about:tor # Spell checker dictionary spellchecker.dictionary=en_US diff --git a/src/install.rdf b/src/install.rdf index 370cad8..87db08f 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.8.0</em:version> + <em:version>1.6.8.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-bundle/master] Document JS option changes in changelog.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 47dba349261163d41bcd0102f1e712fa2fe43f35 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 09:49:43 2014 -0700 Document JS option changes in changelog. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9b66b5e..194ce0f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * All Platforms * Update OpenSSL to 1.0.1g * Bug 9010: Add Turkish language support. + * Bug 9387 testing: Disable JS JIT, type inference, asmjs, and ion. * Update fte transport to 0.2.12 * Update NoScript to 2.6.8.19 * Update Torbutton to 1.6.8.0

1 0

[tor-browser-bundle/master] Update to bump fteproxy to 0.2.12: a simplified build process and fixes for Windows/Linux
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 53a8b3a994be27762c98bc3fa58f38a46532babc Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Sun Apr 6 17:53:46 2014 -0700 Update to bump fteproxy to 0.2.12: a simplified build process and fixes for Windows/Linux --- .../linux/gitian-pluggable-transports.yml | 3 ++- .../windows/gitian-pluggable-transports.yml | 23 ++++++++++---------- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 6619a1c..fbea855 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -133,8 +133,9 @@ script: | cd .. # cd fteproxy + ln -s $INSTDIR/gmp thirdparty/gmp find -type f | xargs touch --date="$REFERENCE_DATETIME" - CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" make + make cp -a bin/fteproxy $PTDIR/ cp -ra fte $PTDIR/ mkdir -p $INSTDIR/Docs/fteproxy diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 9b0e8ec..d2a3005 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -97,7 +97,6 @@ script: | make make install cp -an $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor - cp -an $INSTDIR/gmp/lib/*dll* $INSTDIR/Tor cd .. # # @@ -119,6 +118,7 @@ script: | # http://wiki.winehq.org/msiexec # /qn disables user interface; /i installs. LD_PRELOAD= msiexec /qn /i python.msi TARGETDIR=$INSTDIR/python + sed -i 's/self.dll_libraries = get_msvcr()/pass#self.dll_libraries = get_msvcr()/g' $INSTDIR/python/Lib/distutils/cygwinccompiler.py INSTPYTHON="wine $INSTDIR/python/python.exe" # 7z x py2exe.exe @@ -226,21 +226,20 @@ script: | cd .. # cd fteproxy - cp $INSTDIR/gmp/bin/*dll* . - cp $INSTDIR/gmp/lib/*dll* . ln -s $INSTDIR/gmp thirdparty/gmp + cp -a $INSTDIR/gmp/bin/libgmp-*.dll . find -type f | xargs touch --date="$REFERENCE_DATETIME" - make win32 - make thirdparty/re2/obj/libre2.a - LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace - LD_PRELOAD= $INSTPYTHON setup.py py2exe + WINDOWS_BUILD=1 CROSS_COMPILE=1 make thirdparty/re2/obj/libre2.a + LD_PRELOAD= $INSTPYTHON setup_tbb.py build_ext -c mingw32 + LD_PRELOAD= $INSTPYTHON setup_tbb.py py2exe py2exe_zip_timestomp dist/fteproxy.zip - mkdir -p $PTDIR/fte - mkdir -p $PTDIR/fte/tests cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ - cp -an fte/VERSION $PTDIR/fte - cp -ran fte/defs $PTDIR/fte - cp -ran fte/tests/dfas $PTDIR/fte/tests + mkdir -p $PTDIR/fte + cp -a fte/VERSION $PTDIR/fte + mkdir -p $PTDIR/fte/defs + cp -a fte/defs/*.json $PTDIR/fte/defs + mkdir -p $PTDIR/fte/tests/dfas + cp -a fte/tests/dfas/{*.dfa,*.regex} $PTDIR/fte/tests/dfas mkdir -p $INSTDIR/Docs/fteproxy cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy cd .. diff --git a/gitian/versions b/gitian/versions index b49c276..673cf32 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.6 +FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 498bcb6..5447d76 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.6 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.6 +FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.beta b/gitian/versions.beta index 2d9c3af..8c8433d 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.6 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.6 +FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[tor-browser-bundle/master] Update default PT Bridges.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit ae9d19adf7935782d926919c84977f703b7ebadf Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Tue Apr 8 12:24:27 2014 -0700 Update default PT Bridges. --- Bundle-Data/PTConfigs/bridge_prefs.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 47d20e8..2d9777c 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -2,13 +2,13 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); // Default bridges. -pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); +pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239"); pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); -pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); -pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); +pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); +pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2"); @@ -18,3 +18,6 @@ pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5 pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");

1 0

[tor-browser-bundle/master] Bump Tor Launcher version.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 6d2934c93e402e544e8df8e248134bd3305d26ce Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 08:46:44 2014 -0700 Bump Tor Launcher version. Turkish DTDs were missing. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index af9b59d..9b66b5e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -7,7 +7,7 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * Update Torbutton to 1.6.8.0 * Bug 11242: Fix improper "update needed" message after in-place upgrade. * Bug 10398: Ease translation of about:tor page elements - * Update Tor Launcher to 0.2.5.2 + * Update Tor Launcher to 0.2.5.3 * Bug 9665: Localize Tor's unreachable bridges bootstrap error * Backport Pending Tor Patches: * Bug 9665: Report a bootstrap error if all bridges are unreachable diff --git a/gitian/versions.beta b/gitian/versions.beta index 9ec3927..ca59070 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -8,7 +8,7 @@ FIREFOX_VERSION=24.4.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 -TORLAUNCHER_TAG=0.2.5.2 +TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1

1 0

[tor-browser-bundle/master] Remove busted FTE bridges (bad fingerprints).
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit e58aabac8234b4115cef70030e213caf6444607f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 09:01:34 2014 -0700 Remove busted FTE bridges (bad fingerprints). --- Bundle-Data/PTConfigs/bridge_prefs.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 2d9777c..bb000cd 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,8 +16,10 @@ pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3 pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); -pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +// XXX: Fingerprints changed: +//pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); +//pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); +

1 0

[tor-browser-bundle/master] Move obfsproxy back to 0.2.4.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 13dd293a1888d6faac8fcb39d10c4938c639b443 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 9 11:32:49 2014 -0700 Move obfsproxy back to 0.2.4. Moving back to last known-good. 0.2.6 won't launch either. --- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5447d76..2bdbb2d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.6 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 diff --git a/gitian/versions.beta b/gitian/versions.beta index 8c8433d..9ec3927 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.6 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014

1 0

[tor-browser-bundle/master] Fix changelog for obfsproxy3.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 751c60a211bfea3156f34d63f47a10eabb18f2d8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 9 15:19:21 2014 -0700 Fix changelog for obfsproxy3. --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 42c764c..af9b59d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,7 +2,6 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * All Platforms * Update OpenSSL to 1.0.1g * Bug 9010: Add Turkish language support. - * Update obfs3 transport to 0.2.8 * Update fte transport to 0.2.12 * Update NoScript to 2.6.8.19 * Update Torbutton to 1.6.8.0

1 0

[tor-browser-bundle/master] Bump versions for 3.6beta2.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit c133d234c81d82b2ec94c6afd178897f88f6abb7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 20:05:30 2014 -0700 Bump versions for 3.6beta2. --- Bundle-Data/Docs/ChangeLog.txt | 21 +++++++++++++++++++++ gitian/versions | 4 ++-- gitian/versions.alpha | 6 +++--- gitian/versions.beta | 14 +++++++------- gitian/versions.nightly | 4 ++-- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3f12ac9..42c764c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,24 @@ +Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 + * All Platforms + * Update OpenSSL to 1.0.1g + * Bug 9010: Add Turkish language support. + * Update obfs3 transport to 0.2.8 + * Update fte transport to 0.2.12 + * Update NoScript to 2.6.8.19 + * Update Torbutton to 1.6.8.0 + * Bug 11242: Fix improper "update needed" message after in-place upgrade. + * Bug 10398: Ease translation of about:tor page elements + * Update Tor Launcher to 0.2.5.2 + * Bug 9665: Localize Tor's unreachable bridges bootstrap error + * Backport Pending Tor Patches: + * Bug 9665: Report a bootstrap error if all bridges are unreachable + * Bug 11200: Prevent spurious error message prior to enabling network. + * Linux: + * Bug 11190: Switch linux PT build process to python2 + * Bug 10383: Enable NIST P224 and P256 accel support for 64bit builds. + * Windows: + * Bug 11286: Fix fte transport launch error + Tor Browser Bundle 3.5.4 -- Apr 7 2014 * All Platforms * Update OpenSSL to 1.0.1g diff --git a/gitian/versions b/gitian/versions index 570656d..b49c276 100755 --- a/gitian/versions +++ b/gitian/versions @@ -39,7 +39,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.19-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -63,7 +63,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 +NOSCRIPT_HASH=6cf5387e3501923a22673887151c76187e1cd14a63b5d0b5d774a26db21ed69a MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.alpha b/gitian/versions.alpha index baee44a..498bcb6 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.4 +OBFSPROXY_TAG=obfsproxy-0.2.6 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -40,7 +40,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.19-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -64,7 +64,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 +NOSCRIPT_HASH=6cf5387e3501923a22673887151c76187e1cd14a63b5d0b5d774a26db21ed69a MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.beta b/gitian/versions.beta index 53060ca..2d9c3af 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6-beta-1 +TORBROWSER_VERSION=3.6-beta-2 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -6,17 +6,17 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.4.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 -TORLAUNCHER_TAG=0.2.5.1a -TORBUTTON_TAG=1.6.7.0 +TORLAUNCHER_TAG=0.2.5.2 +TORBUTTON_TAG=1.6.8.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.4 +OBFSPROXY_TAG=obfsproxy-0.2.6 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 @@ -40,7 +40,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.19-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -64,7 +64,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 +NOSCRIPT_HASH=6cf5387e3501923a22673887151c76187e1cd14a63b5d0b5d774a26db21ed69a MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f3f0dca..911898d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -40,7 +40,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.19-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -64,7 +64,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 +NOSCRIPT_HASH=6cf5387e3501923a22673887151c76187e1cd14a63b5d0b5d774a26db21ed69a MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Backport fix for Bug9665.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit ab04781bdb01977b9b122681474bfecb96017169 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 20:05:47 2014 -0700 Backport fix for Bug9665. --- gitian/descriptors/linux/gitian-tor.yml | 4 +- gitian/descriptors/mac/gitian-tor.yml | 2 + gitian/descriptors/windows/gitian-tor.yml | 2 + gitian/patches/bug9665.patch | 108 +++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 698fcba..15ba469 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -28,8 +28,9 @@ files: - "bug5018.patch" - "bug9229.patch" - "bug11156.patch" -- "bug11069.patch" - "bug11200.patch" +- "bug11069.patch" +- "bug9665.patch" - "dzip.sh" - "openssl.tar.gz" script: | @@ -98,6 +99,7 @@ script: | git am ~/build/bug11156.patch fi git am ~/build/bug11200.patch + git am ~/build/bug9665.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 30c23bb..5ea3b4e 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -31,6 +31,7 @@ files: - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" +- "bug9665.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -109,6 +110,7 @@ script: | git am ~/build/bug11156.patch fi git am ~/build/bug11200.patch + git am ~/build/bug9665.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 1698726..6369e7f 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -30,6 +30,7 @@ files: - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" +- "bug9665.patch" - "binutils.tar.bz2" - "dzip.sh" - "openssl.tar.gz" @@ -105,6 +106,7 @@ script: | git am ~/build/bug11156.patch fi git am ~/build/bug11200.patch + git am ~/build/bug9665.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/patches/bug9665.patch b/gitian/patches/bug9665.patch new file mode 100644 index 0000000..aeab37b --- /dev/null +++ b/gitian/patches/bug9665.patch @@ -0,0 +1,108 @@ +From 08ae53e400ff6fa2d8147aad440c38173c106cae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?F=C3=A1bio=20J=2E=20Bertinatto?= <fabiojrb(a)gmail.com> +Date: Tue, 5 Nov 2013 00:50:16 -0200 +Subject: [PATCH 1/3] Fix bug9665 + +--- + src/or/connection_or.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index 04ad2cc..ba3ac00 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -1195,6 +1195,11 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, + "your pluggable transport proxy stopped running.", + fmt_addrport(&TO_CONN(conn)->addr, TO_CONN(conn)->port), + transport_name, transport_name); ++ ++ control_event_bootstrap_problem( ++ "Can't connect to bridge", ++ END_OR_CONN_REASON_NO_ROUTE); ++ + } else { + log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but " + "the proxy address could not be found.", +-- +1.8.1.2 + +From 754a50592c412d95d2eb48038784d0ef725a7dc2 Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Mon, 7 Apr 2014 13:41:07 -0400 +Subject: [PATCH 2/3] Forward-port bug9665 fix to work with our fix for 11069 + +--- + src/or/connection_or.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index ba3ac00..01ff4dc 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -1198,7 +1198,8 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, + + control_event_bootstrap_problem( + "Can't connect to bridge", +- END_OR_CONN_REASON_NO_ROUTE); ++ END_OR_CONN_REASON_NO_ROUTE, ++ conn); + + } else { + log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but " +-- +1.8.1.2 + +From 90341b4852bf88f1fdf9fd150fa2f5c47f88b2cb Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Mon, 7 Apr 2014 13:44:22 -0400 +Subject: [PATCH 3/3] For missing transport, say "PT_MISSING" not "NO_ROUTE" + +--- + src/or/connection_or.c | 2 +- + src/or/or.h | 3 ++- + src/or/reasons.c | 2 ++ + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index 01ff4dc..6572a91 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -1198,7 +1198,7 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, + + control_event_bootstrap_problem( + "Can't connect to bridge", +- END_OR_CONN_REASON_NO_ROUTE, ++ END_OR_CONN_REASON_PT_MISSING, + conn); + + } else { +diff --git a/src/or/or.h b/src/or/or.h +index 38ab176..1b35c1f 100644 +--- a/src/or/or.h ++++ b/src/or/or.h +@@ -604,7 +604,8 @@ typedef enum { + #define END_OR_CONN_REASON_NO_ROUTE 6 /* no route to host/net */ + #define END_OR_CONN_REASON_IO_ERROR 7 /* read/write error */ + #define END_OR_CONN_REASON_RESOURCE_LIMIT 8 /* sockets, buffers, etc */ +-#define END_OR_CONN_REASON_MISC 9 ++#define END_OR_CONN_REASON_PT_MISSING 9 /* PT failed or not available */ ++#define END_OR_CONN_REASON_MISC 10 + + /* Reasons why we (or a remote OR) might close a stream. See tor-spec.txt for + * documentation of these. The values must match. */ +diff --git a/src/or/reasons.c b/src/or/reasons.c +index 0674474..750e89b 100644 +--- a/src/or/reasons.c ++++ b/src/or/reasons.c +@@ -231,6 +231,8 @@ orconn_end_reason_to_control_string(int r) + return "RESOURCELIMIT"; + case END_OR_CONN_REASON_MISC: + return "MISC"; ++ case END_OR_CONN_REASON_PT_MISSING: ++ return "PT_MISSING"; + case 0: + return ""; + default: +-- +1.8.1.2 +

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits