- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Fix typo in changelog
by gk＠torproject.org 05 Nov '15

05 Nov '15

commit 310740285eed2a0e5fc2fd05c29eaa5ebeec27b9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 5 11:16:53 2015 +0000 Fix typo in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 0b2a51c..2a4af99 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,7 +5,7 @@ Tor Browser 5.5a4 -- November 3 2015 * Update NoScript to 2.6.9.39 * Update HTTPS-Everywhere to 5.1.1 * Update Torbutton to 1.9.4.1 - * Bug 9263: Spoof Referer when leaving a .onion domain + * Bug 9623: Spoof Referer when leaving a .onion domain * Bug 16620: Remove old window.name handling code * Bug 17164: Don't show text-select cursor on circuit display * Bug 17351: Remove unused code

1 0

[tor-browser-bundle/master] Bug 17511: fix sha256sums file in continuous builds
by gk＠torproject.org 03 Nov '15

03 Nov '15

commit 7643c10134ff66c427974e36130bfdc1faa044fd Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 2 20:01:02 2015 +0100 Bug 17511: fix sha256sums file in continuous builds --- tools/continuous-builds/build-tbb.sh | 4 ++-- tools/continuous-builds/park-nightly.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index f1be4ef..6c8d248 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -61,8 +61,8 @@ if [ $status = done ]; then echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 - sha256sum *.tar.xz *.zip *.dmg *.exe > sha256sums.txt - gpg -a --clearsign $PGPKEYID sha256sums.txt || exit 2 + sha256sum *.tar.xz *.zip *.dmg *.exe > sha256sums-unsigned-build.txt + gpg $PGPKEYID -abs sha256sums-unsigned-build.txt || exit 2 cd .. D=$(basename $NEWDESTDIR) tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe $D/*.dmg | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index dbc01e4..0f418b2 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -16,10 +16,10 @@ DSTDIR=tbb-nightly-$(date +%F) do_check() { [ -z "$1" ] || cd $1 || exit 5 - [ -z "$V" ] || echo "Verifying sha256sums.txt" - gpg -q --verify sha256sums.txt.asc > /dev/null || exit 3 - [ -z "$V" ] || echo "Checking sha256sums.txt" - sha256sum --strict --quiet -c sha256sums.txt || exit 4 + [ -z "$V" ] || echo "Verifying sha256sums-unsigned-build.txt" + gpg -q --verify sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.txt > /dev/null || exit 3 + [ -z "$V" ] || echo "Checking sha256sums-unsigned-build.txt" + sha256sum --strict --quiet -c sha256sums-unsigned-build.txt || exit 4 } if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then

1 0

[tor-browser-bundle/maint-5.0] Update the changelog for 5.0.4
by gk＠torproject.org 02 Nov '15

02 Nov '15

commit bcf1d2ea96af55cd4b4220727b124e361411e4a1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 2 10:11:41 2015 +0000 Update the changelog for 5.0.4 --- 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 fab04c9..08e1bae 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -11,6 +11,7 @@ Tor Browser 5.0.4 -- November 3 2015 * Translation updates * Bug 16937: Remove the en-US dictionary from non en-US Tor Browser bundles * Bug 17318: Remove dead ScrambleSuit bridge + * Bug 17473: Update meek-amazon fingerprint * Bug 16983: Isolate favicon requests caused by the tab list dropdown * Bug 17102: Don't crash while opening a second Tor Browser * Windows:

1 0

[tor-browser-bundle/hardened-builds] Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296.
by gk＠torproject.org 02 Nov '15

02 Nov '15

commit 6f3b8d5c8d85fcef148b6f4b5861d63d6e2f157a Author: David Fifield <david(a)bamsoftware.com> Date: Fri Oct 30 09:26:09 2015 -0700 Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296. The bridge fingerprint changed when the bridge was restarted on 2015-10-09: https://lists.torproject.org/pipermail/tor-talk/2015-October/039234.html https://bugs.torproject.org/17473 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index fa0d92f..a055d8f 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -25,5 +25,5 @@ pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 4EE0CC769EB4B15A872F742EDE27D298A59DCADE url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/maint-5.0] Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296.
by gk＠torproject.org 02 Nov '15

02 Nov '15

commit a6cabe7f9d6134a362872daaf07e0a5bc3806242 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Oct 30 09:26:09 2015 -0700 Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296. The bridge fingerprint changed when the bridge was restarted on 2015-10-09: https://lists.torproject.org/pipermail/tor-talk/2015-October/039234.html https://bugs.torproject.org/17473 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 8f8af9a..3aab4c6 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -31,5 +31,5 @@ pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 4EE0CC769EB4B15A872F742EDE27D298A59DCADE url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Update changelog
by gk＠torproject.org 01 Nov '15

01 Nov '15

commit b16859eaacd75e64384f9e47b1e730d43638c4ca Author: Georg Koppen <gk(a)torproject.org> Date: Sun Nov 1 09:55:31 2015 +0000 Update 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 ba4a3b5..0b2a51c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -17,6 +17,7 @@ Tor Browser 5.5a4 -- November 3 2015 * Bug 10599+17305: Include updater and build patches needed for hardened builds * Bug 17318: Remove dead ScrambleSuit bridge * Bug 17428: Remove default Flashproxy bridges + * Bug 17473: Update meek-amazon fingerprint * Windows * Bug 17250: Add localized font names to font whitelist * OS X

1 0

[tor-browser-bundle/master] Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296.
by gk＠torproject.org 01 Nov '15

01 Nov '15

commit f3f77d9d00bbee358eec588ccf1b833d72989527 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Oct 30 09:26:09 2015 -0700 Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296. The bridge fingerprint changed when the bridge was restarted on 2015-10-09: https://lists.torproject.org/pipermail/tor-talk/2015-October/039234.html https://bugs.torproject.org/17473 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index fa0d92f..a055d8f 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -25,5 +25,5 @@ pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 4EE0CC769EB4B15A872F742EDE27D298A59DCADE url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-launcher/master] Update translations
by gk＠torproject.org 01 Nov '15

01 Nov '15

commit 82d5fa132792ca130532cb6438d71a033a48cfdc Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 31 20:53:55 2015 +0000 Update translations --- src/chrome/locale/es/network-settings.dtd | 4 ++-- src/chrome/locale/fa/network-settings.dtd | 4 ++-- src/chrome/locale/fil/progress.dtd | 4 ++-- src/chrome/locale/fr/network-settings.dtd | 4 ++-- src/chrome/locale/ky/network-settings.dtd | 4 ++-- src/chrome/locale/ro/network-settings.dtd | 4 ++-- src/chrome/locale/ru/network-settings.dtd | 4 ++-- src/chrome/locale/sv/network-settings.dtd | 4 ++-- src/chrome/locale/uk/network-settings.dtd | 4 ++-- src/chrome/locale/ur/network-settings.dtd | 2 +- src/chrome/locale/ur/progress.dtd | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index ed03009..64547c1 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Configuración de la red Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor"> +<!ENTITY torlauncher.localePicker.prompt "Por favor, seleccione un idioma.">  diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 9a66be2..b7d2076 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "تنظیمات شبکه تور">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "زبان مرورگر تور"> +<!ENTITY torlauncher.localePicker.prompt "لطفا یک زبان انتخاب کنید.">  diff --git a/src/chrome/locale/fil/progress.dtd b/src/chrome/locale/fil/progress.dtd index df60b42..33bbaca 100644 --- a/src/chrome/locale/fil/progress.dtd +++ b/src/chrome/locale/fil/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Buksan ang Settings"> -<!ENTITY torprogress.heading "Kumukonekta sa network ng Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.heading "Nakikipag-ugnayan sa network ng Tor."> +<!ENTITY torprogress.pleaseWait "Pakihintay sandali habang tayo ay nakikipag-ugnayan sa kabalagan ng Tor."> diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 9b4f6d0..c6eb480 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -1,7 +1,7 @@ -<!ENTITY torsettings.dialog.title "Paramètres du réseau Tor"> +<!ENTITY torsettings.dialog.title "Paramètres du Réseau Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> +<!ENTITY torlauncher.localePicker.title "Language du navigateur Tor"> <!ENTITY torlauncher.localePicker.prompt "Merci de sélectionner une langue.">  diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd index ef50668..fee491d 100644 --- a/src/chrome/locale/ky/network-settings.dtd +++ b/src/chrome/locale/ky/network-settings.dtd @@ -41,8 +41,8 @@ <!ENTITY torsettings.useProxy.address "Дарек:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.username "Колдонуучунун аты"> +<!ENTITY torsettings.useProxy.password "Сыр сөз:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index 6561901..5e77179 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Setări rețea Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Limba pentru Tor Browser"> +<!ENTITY torlauncher.localePicker.prompt "Va rugăm sa alegeți o limba.">  diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index 4880f19..41072da 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Сетевые настройки Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Язык Браузера Tor"> +<!ENTITY torlauncher.localePicker.prompt "Пожалуйста, выберите язык.">  diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index 6ec3077..c53103f 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Nätverksinställningar för Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Språk i Tor-webbläsare"> +<!ENTITY torlauncher.localePicker.prompt "Vänligen välj ett språk.">  diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index a3468a9..8703783 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Налаштування мережі Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Мова Tor Browser"> +<!ENTITY torlauncher.localePicker.prompt "Будь ласка, оберіть мову.">  diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index b193750..cad9bd9 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "طور نیٹ ورک کے سیٹنگز">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> diff --git a/src/chrome/locale/ur/progress.dtd b/src/chrome/locale/ur/progress.dtd index ebd9cef..c8710bb 100644 --- a/src/chrome/locale/ur/progress.dtd +++ b/src/chrome/locale/ur/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> +<!ENTITY torprogress.dialog.title "طور کے حیثیت"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">

1 0

[tor-launcher/master] Version bump
by gk＠torproject.org 01 Nov '15

01 Nov '15

commit 7a971cbbc00edbfecc5953769338a9552aa04469 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 31 20:56:27 2015 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index a7524b7..48a9471 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.7</em:version> + <em:version>0.2.8</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-browser-bundle/master] Bug 16909: Don't download submodules while building
by gk＠torproject.org 31 Oct '15

31 Oct '15

commit 7848440fab0426df4b62fece4adb70cd1261499f Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 31 08:18:08 2015 +0000 Bug 16909: Don't download submodules while building a) this is wrong and b) it is currently broken due to a certificate error. --- gitian/descriptors/linux/gitian-bundle.yml | 17 +++++++---------- gitian/descriptors/mac/gitian-bundle.yml | 17 +++++++---------- gitian/descriptors/windows/gitian-bundle.yml | 17 +++++++---------- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index f1d99e9..15f6359 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -116,16 +116,13 @@ script: | # Workaround for git not knowing `git submodule -f` in the version shipped in # 10.04. sed 's/recursive -f/recursive/' -i makexpi.sh - # We are invoking the build script with a particular tag to avoid #10066. This - # does not work for nightlies as there is no "master" tag in that sense. But - # we don't need to care about that as we don't need reproducibility for - # nightly builds. - if [ $HTTPSE_TAG != "master" ]; - then - ./makexpi.sh $HTTPSE_TAG - else - ./makexpi.sh - fi + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + # The solution there does not work for us as doing something like + # |./makexpi.sh foo| to build tag |foo| is a) trying to download the sources + # during build time (again) and b) broken due to a certificate error. + rm -f .git/refs/heads/master + ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp pkg/*.xpi ../${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 458d613..0199cca 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -111,16 +111,13 @@ script: | cd ../../../ # cd https-everywhere - # We are invoking the build script with a particular tag to avoid #10066. This - # does not work for nightlies as there is no "master" tag in that sense. But - # we don't need to care about that as we don't need reproducibility for - # nightly builds. - if [ $HTTPSE_TAG != "master" ]; - then - ./makexpi.sh $HTTPSE_TAG - else - ./makexpi.sh - fi + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + # The solution there does not work for us as doing something like + # |./makexpi.sh foo| to build tag |foo| is a) trying to download the sources + # during build time (again) and b) broken due to a certificate error. + rm -f .git/refs/heads/master + ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index eac3345..51565bf 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -98,16 +98,13 @@ script: | cd ../../../ # cd https-everywhere - # We are invoking the build script with a particular tag to avoid #10066. This - # does not work for nightlies as there is no "master" tag in that sense. But - # we don't need to care about that as we don't need reproducibility for - # nightly builds. - if [ $HTTPSE_TAG != "master" ]; - then - ./makexpi.sh $HTTPSE_TAG - else - ./makexpi.sh - fi + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + # The solution there does not work for us as doing something like + # |./makexpi.sh foo| to build tag |foo| is a) trying to download the sources + # during build time (again) and b) broken due to a certificate error. + rm -f .git/refs/heads/master + ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi

1 0

[tor-browser-bundle/master] Version bumps, changelog update
by gk＠torproject.org 31 Oct '15

31 Oct '15

commit c023bbcc3abb9a577004c30becb38c77b38eda6f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 30 22:06:48 2015 +0000 Version bumps, changelog update --- Bundle-Data/Docs/ChangeLog.txt | 26 ++++++++++++++++++++++++++ gitian/versions.alpha | 12 ++++++------ gitian/versions.nightly | 8 ++++---- tools/update-responses/config.yml | 12 ++++++------ 4 files changed, 42 insertions(+), 16 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 71154c4..ba4a3b5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,29 @@ +Tor Browser 5.5a4 -- November 3 2015 + * All Platforms + * Update Firefox to 38.4.0esr + * Update Tor to 0.2.7.4-rc + * Update NoScript to 2.6.9.39 + * Update HTTPS-Everywhere to 5.1.1 + * Update Torbutton to 1.9.4.1 + * Bug 9263: Spoof Referer when leaving a .onion domain + * Bug 16620: Remove old window.name handling code + * Bug 17164: Don't show text-select cursor on circuit display + * Bug 17351: Remove unused code + * Translation updates + * Bug 17207: Hide MIME types and plugins from websites + * Bug 16909+17383: Adapt to HTTPS-Everywhere build changes + * Bug 16620: Move window.name handling into a Firefox patch + * Bug 17220: Support math symbols in font whitelist + * Bug 10599+17305: Include updater and build patches needed for hardened builds + * Bug 17318: Remove dead ScrambleSuit bridge + * Bug 17428: Remove default Flashproxy bridges + * Windows + * Bug 17250: Add localized font names to font whitelist + * OS X + * Bug 17122: Rename Japanese OS X bundle + * Linux + * Bug 17329: Ensure that non-ASCII characters can be typed (fixup of #5926) + Tor Browser 5.5a3 -- September 22 2015 * All Platforms * Update Firefox to 38.3.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 3588096..81818e8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -7,14 +7,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.3.0esr +FIREFOX_VERSION=38.4.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build4 -TOR_TAG=tor-0.2.7.2-alpha +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 +TOR_TAG=tor-0.2.7.4-rc TORLAUNCHER_TAG=0.2.7.7 -TORBUTTON_TAG=1.9.4 +TORBUTTON_TAG=1.9.4.1 HTTPSE_TAG=5.1.1 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 @@ -62,7 +62,7 @@ NOTOCJKFONT_VER=1.004 ## 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.9.36-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.39-sm+fx+fn.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=MacOSX10.7.sdk.tar.gz @@ -93,7 +93,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0585d95161711f6e4bcd56ed6f160c15bbf08ab6c559a675ce659e6c8ffb150d +NOSCRIPT_HASH=dd904c6a12a8b1f6b1da48d51e4df903d7f9211ba5b3f32d7272f413a3bf548a MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4e8cd42..9f1c6b4 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -14,11 +14,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.3.0esr +FIREFOX_VERSION=38.4.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -69,7 +69,7 @@ NOTOCJKFONT_VER=1.004 ## 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.9.36-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.39-sm+fx+fn.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=MacOSX10.7.sdk.tar.gz @@ -100,7 +100,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0585d95161711f6e4bcd56ed6f160c15bbf08ab6c559a675ce659e6c8ffb150d +NOSCRIPT_HASH=dd904c6a12a8b1f6b1da48d51e4df903d7f9211ba5b3f32d7272f413a3bf548a MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index dcef911..acfa5db 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 5.5a3 + alpha: 5.5a4 release: 5.0 versions: 5.0: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.5a3: - platformVersion: 38.3.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-55a3-released - download_url: https://www.torproject.org/dist/torbrowser/5.5a3 + 5.5a4: + platformVersion: 38.4.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-55a4-released + download_url: https://www.torproject.org/dist/torbrowser/5.5a4 incremental_from: - - 5.5a2 + - 5.5a3 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/master] Update changelog; bump version
by gk＠torproject.org 31 Oct '15

31 Oct '15

commit 930cbdb5d4366815a5a04e9d4a0565c73ea2cd0c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 30 20:08:43 2015 +0000 Update changelog; bump version --- src/CHANGELOG | 7 +++++++ src/install.rdf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 76fa989..0347f11 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.9.4.1 + * Bug 9263: Spoof Referer when leaving a .onion domain + * Bug 16620: Move window.name handling into a Firefox patch + * Bug 17164: Don't show text-select cursor on circuit display + * Bug 17351: Remove unused code + * Translation updates + 1.9.4 * Bug 16937: Don't translate the hompepage/spellchecker dictionary string * Bug 16735: about:tor should accommodate different fonts/font sizes diff --git a/src/install.rdf b/src/install.rdf index db9af4b..267870c 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.9.4</em:version> + <em:version>1.9.4.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

[torbutton/master] Bug 16620: Transform window.name handling into Firefox patch.
by gk＠torproject.org 31 Oct '15

31 Oct '15

commit 4afb4f104685466ee0ac4f98fda7dd57d6d522c2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Oct 14 15:19:20 2015 -0400 Bug 16620: Transform window.name handling into Firefox patch. Removed torbutton_weblistener and torbutton_check_progress(). --- src/chrome/content/torbutton.js | 173 --------------------------------------- 1 file changed, 173 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index fb9c8c3..58ab20e 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2907,15 +2907,6 @@ function torbutton_do_main_window_startup() { torbutton_log(3, "Torbutton main window startup"); m_tb_is_main_window = true; - - // http://www.xulplanet.com/references/xpcomref/ifaces/nsIWebProgress.html - var progress = - Components.classes["@mozilla.org/docloaderservice;1"]. - getService(Components.interfaces.nsIWebProgress); - - progress.addProgressListener(torbutton_weblistener, - Components.interfaces.nsIWebProgress.NOTIFY_LOCATION); - torbutton_unique_pref_observer.register(); } @@ -3181,11 +3172,6 @@ function torbutton_close_window(event) { } } - // remove old listeners - var progress = Components.classes["@mozilla.org/docloaderservice;1"]. - getService(Components.interfaces.nsIWebProgress); - - progress.removeProgressListener(torbutton_weblistener); torbutton_unique_pref_observer.unregister(); if(m_tb_is_main_window) { // main window not reset above @@ -3209,165 +3195,6 @@ function torbutton_open_network_settings() { window.addEventListener('load',torbutton_new_window,false); window.addEventListener('unload', torbutton_close_window, false); -// FIXME: Tons of exceptions get thrown from this function on account -// of its being called so early. Need to find a quick way to check if -// aProgress and aRequest are actually fully initialized -// (without throwing exceptions) -// Bug 1506 P0: This is to block full page plugins. Not needed anymore -// due to better (but non-toggle-friendly) plugin APIs) -function torbutton_check_progress(aProgress, aRequest, aFlags, new_loc) { - if (!m_tb_wasinited) { - torbutton_init(); - } - - var DOMWindow = null; - - // Bug #866: Zotero conflict with about:blank windows - // handle docshell JS switching and other early duties - var WP_STATE_START = Ci.nsIWebProgressListener.STATE_START; - var WP_STATE_DOC = Ci.nsIWebProgressListener.STATE_IS_DOCUMENT; - var WP_STATE_START_DOC = WP_STATE_START | WP_STATE_DOC; - - if ((aFlags & WP_STATE_START_DOC) == WP_STATE_START_DOC - && aRequest instanceof Ci.nsIChannel - && !(aRequest.loadFlags & aRequest.LOAD_INITIAL_DOCUMENT_URI) - && aRequest.URI.spec == "about:blank") { - torbutton_log(3, "Passing on about:blank"); - return 0; - } - - if(aProgress) { - try { - DOMWindow = aProgress.DOMWindow; - } catch(e) { - torbutton_log(4, "Exception on DOMWindow: "+e); - DOMWindow = null; - } - } - - if(!DOMWindow) { - try { - if(aRequest.notificationCallbacks) { - DOMWindow = aRequest.notificationCallbacks.QueryInterface( - Components.interfaces.nsIInterfaceRequestor).getInterface( - Components.interfaces.nsIDOMWindow); - } - } catch(e) { } - } - - // TODO: separate this from the above? - if(DOMWindow) { - var doc = DOMWindow.document; - try { - if(doc) { - if(doc.domain) { - var referrer = null; - var win = DOMWindow.window; - - try { - var hreq = aRequest.QueryInterface(Ci.nsIHttpChannel); - referrer = hreq.referrer; - } catch(e) {} - - try { - // XXX: The patch from https://bugzilla.mozilla.org/show_bug.cgi?id=444222 - // might be better here.. - // - // Ticket #3414: Apply referer policy to window.name. - // - // This keeps window.name clean between fresh urls. - // It should also apply to iframes because hookdoc gets called for all - // frames and subdocuments. - // - // The about:blank check handles the 'name' attribute of framesets, which - // get set before the referer is set on the channel. - if ((!referrer || referrer.spec == "") && win.location != "about:blank") { - if (win.top == win.window) { - // Only reset if we're the top-level window - //torbutton_log(4, "Resetting window.name: "+win.name+" for "+win.location); - win.name = ""; - win.window.name = ""; - } - } - } catch(e) { - torbutton_log(4, "Failed to reset window.name: "+e) - } - } - } - } catch(e) { - try { - if(doc && doc.location && - (doc.location.href.indexOf("about:") != 0 && - doc.location.href.indexOf("chrome:") != 0)) { - torbutton_safelog(4, "Exception "+e - +" on tag application at: ", - doc.location); - } else { - torbutton_eclog(3, "Got an about url: "+e); - } - } catch(e1) { - torbutton_eclog(3, "Got odd url "+e); - } - } - } else { - torbutton_eclog(3, "No aProgress for location!"); - } - return 0; -} - -// Warning: These can also fire when the 'debuglogger' extension -// updates its window. Typically for this, doc.domain is null. Do not -// log in this case (until we find a better way to filter those -// events out). Use torbutton_eclog for common-path stuff.] -// -// Bug 1506 P0: This listener is for blocking plugins and installing JS hooks. -// It can be eliminated. -var torbutton_weblistener = -{ - QueryInterface: function(aIID) - { - if (aIID.equals(Components.interfaces.nsIWebProgressListener) || - aIID.equals(Components.interfaces.nsISupportsWeakReference) || - aIID.equals(Components.interfaces.nsISupports)) - return this; - throw Components.results.NS_NOINTERFACE; - }, - - onLocationChange: function(aProgress, aRequest, aURI) - { - torbutton_eclog(2, 'onLocationChange: '+aURI.asciiSpec); - if(aURI.scheme == "about" || aURI.scheme == "chrome") { - torbutton_eclog(3, "Skipping location change for "+aURI.asciiSpec); - } else { - return torbutton_check_progress(aProgress, aRequest, 0, true); - } - }, - - // XXX: The following can probably go - onStateChange: function(aProgress, aRequest, aFlag, aStatus) - { - torbutton_eclog(2, 'State change()'); - return torbutton_check_progress(aProgress, aRequest, aFlag, false); - }, - - onProgressChange: function(aProgress, aRequest, curSelfProgress, maxSelfProgress, curTotalProgress, maxTotalProgress) - { - torbutton_eclog(2, 'called progressChange'); - return torbutton_check_progress(aProgress, aRequest, 0, false); - }, - - onStatusChange: function(aProgress, aRequest, stat, message) - { - torbutton_eclog(2, 'called progressChange'); - return torbutton_check_progress(aProgress, aRequest, 0, false); - }, - - onSecurityChange: function() {return 0;}, - - onLinkIconAvailable: function() - { /*torbutton_eclog(1, 'called linkIcon'); */ return 0; } -} - var m_tb_resize_handler = null; var m_tb_resize_date = null;

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] Bug 16620: Clear window.name when no referrer sent
by gk＠torproject.org 31 Oct '15

31 Oct '15

commit 95a62d13e045b950ed2b2f242da7413d33386a47 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Oct 30 14:28:13 2015 -0400 Bug 16620: Clear window.name when no referrer sent Convert JS implementation (within Torbutton) to a C++ browser patch. --- docshell/base/nsDocShell.cpp | 47 +++++++++++++ docshell/test/mochitest.ini | 2 + docshell/test/test_tor_bug16620.html | 129 ++++++++++++++++++++++++++++++++++ docshell/test/tor_bug16620.html | 51 ++++++++++++++ 4 files changed, 229 insertions(+) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 03885534..59f184e 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -8992,6 +8992,53 @@ nsDocShell::CreateContentViewer(const char* aContentType, aOpenedChannel->GetURI(getter_AddRefs(mLoadingURI)); } FirePageHideNotification(!mSavingOldViewer); + + // Tor bug # 16620: Clear window.name if there is no referrer. We make an + // exception for new windows, e.g., window.open(url, "MyName"). + bool isNewWindowTarget = false; + nsCOMPtr<nsIPropertyBag2> props(do_QueryInterface(aRequest, &rv)); + if (props) { + props->GetPropertyAsBool(NS_LITERAL_STRING("docshell.newWindowTarget"), + &isNewWindowTarget); + } + + if (!isNewWindowTarget) { + nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aOpenedChannel)); + nsCOMPtr<nsIURI> httpReferrer; + if (httpChannel) + httpChannel->GetReferrer(getter_AddRefs(httpReferrer)); + +#ifdef DEBUG_WINDOW_NAME + printf("DOCSHELL %p CreateContentViewer - possibly clearing window.name:\n", this); + printf(" current window.name: \"%s\"\n", + NS_ConvertUTF16toUTF8(mName).get()); + + nsAutoCString curSpec, loadingSpec; + if (this->mCurrentURI) + mCurrentURI->GetSpec(curSpec); + if (mLoadingURI) + mLoadingURI->GetSpec(loadingSpec); + printf(" current URI: %s\n", curSpec.get()); + printf(" loading URI: %s\n", loadingSpec.get()); + + if (!httpReferrer) { + printf(" referrer: None\n"); + } else { + nsAutoCString refSpec; + httpReferrer->GetSpec(refSpec); + printf(" referrer: %s\n", refSpec.get()); + } +#endif + + if (!httpReferrer) + SetName(NS_LITERAL_STRING("")); + +#ifdef DEBUG_WINDOW_NAME + printf(" action taken: %s window.name\n", + httpReferrer ? "Preserved" : "Cleared"); +#endif + } + mLoadingURI = nullptr; // Set mFiredUnloadEvent = false so that the unload handler for the diff --git a/docshell/test/mochitest.ini b/docshell/test/mochitest.ini index 3668c58..a1325b9 100644 --- a/docshell/test/mochitest.ini +++ b/docshell/test/mochitest.ini @@ -34,6 +34,7 @@ support-files = file_bug728939.html file_pushState_after_document_open.html historyframes.html + tor_bug16620.html [test_anchor_scroll_after_document_open.html] [test_bfcache_plus_hash.html] @@ -107,3 +108,4 @@ support-files = file_framedhistoryframes.html skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug1121701.html] skip-if = (buildapp == 'b2g' || buildapp == 'mulet') +[test_tor_bug16620.html] diff --git a/docshell/test/test_tor_bug16620.html b/docshell/test/test_tor_bug16620.html new file mode 100644 index 0000000..0fe9603 --- /dev/null +++ b/docshell/test/test_tor_bug16620.html @@ -0,0 +1,129 @@ +<!DOCTYPE HTML> +<html> + +<meta charset="utf-8"> +<head> + <title>Test for Tor Bug 16620 - Clear window.name when no referrer sent</title> + <script type="application/javascript" + src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> +</head> +<body> +<a target="_blank" href="https://trac.torproject.org/projects/tor/ticket/16620">Tor Bug 16620</a> +<script type="application/javascript;version=1.7"> + +// ## Test constants +const kTestPath = "/tests/docshell/test/"; +const kFile = "tor_bug16620.html"; +const kBaseURL1 = "http://example.com"; +const kBaseURL2 = "http://example.net"; + +let gTests = [ + // Test #1: Same domain: + { startURL: kBaseURL1, destURL: kBaseURL1, + expectIsolation: false }, + + // Test #2: Different top-level domains: + { startURL: kBaseURL1, destURL: kBaseURL2, + expectIsolation: false }, + + // Test #3: Same domain, rel="noreferrer" on link: + { startURL: kBaseURL1, destURL: kBaseURL1, noReferrerOnLink: true, + expectIsolation: true }, + + // Test #4: Same domain, "no-referrer" meta tag in document: + { startURL: kBaseURL1, destURL: kBaseURL1, noReferrerInMetaTag: true, + expectIsolation: true }, + + // Test #5: Like test 4, but reset window.name during unload: + // (similar to http://www.thomasfrank.se/sessvarsTestPage1.html) + { startURL: kBaseURL1, destURL: kBaseURL1, noReferrerInMetaTag: true, + resetInUnload: true, + expectIsolation: true }, + + // Test #6: Data URL as destination (no referrer): + { startURL: kBaseURL1, + expectIsolation: true }, +]; + +let gCurTest = 0; +let gCurWinName, gChildWin, gDataURL; + +// ## Utility functions +function generateRandomName() +{ + // Generate a random 6 character string using 0-9 and a-z. + return ((1 + Math.random()).toString(36) + '000000').substr(2, 6); +} + +function startNextTest() { + ++gCurTest; + if (gCurTest > gTests.length) { + SimpleTest.finish(); + } else { + let curTest = gTests[gCurTest - 1]; + let url = curTest.startURL + kTestPath + kFile + "?firstDocLoaded"; + gCurWinName = generateRandomName(); + gChildWin = window.open(url, gCurWinName); + } +} + +// ## Add a message event listener. +window.addEventListener("message", function(aEvent) { + if (aEvent.source !== gChildWin) + return; + +// console.log("parent received message:" + JSON.stringify(aEvent.data)); + + let curTest = gTests[gCurTest - 1]; + let state = aEvent.data.state; + let winName = aEvent.data.winName; + if ("firstDocLoaded" == state) { + ok(winName === gCurWinName, "Test #" + gCurTest + + " - first document's name matches window.open parameter"); + + // Send an "openURL" message to the loaded document. + let url2 = (curTest.destURL) + ? curTest.destURL + kTestPath + kFile + "?secondDocLoaded" + : gDataURL; + let noReferrerOnLink = (curTest.noReferrerOnLink === true); + let noReferrerInMetaTag = (curTest.noReferrerInMetaTag === true); + let resetInUnload = (curTest.resetInUnload === true); + aEvent.source.postMessage({ action: "openURL", url: url2, + noReferrerOnLink: noReferrerOnLink, + noReferrerInMetaTag: noReferrerInMetaTag, + resetInUnload: resetInUnload }, + aEvent.origin); + } else if ("secondDocLoaded" == state) { + if (curTest.expectIsolation) { + ok(winName === "", + "Test #" + gCurTest + " - second document: name was cleared"); + } else { + ok(winName === gCurWinName, + "Test #" + gCurTest + " - second document: name was preserved"); + } + + gChildWin.close(); + startNextTest(); + } + }, false); + +SimpleTest.waitForExplicitFinish(); + +// Read file contents, construct a data URL (used by some tests), and +// then start the first test. +let url = kTestPath + kFile; +let xhr = new XMLHttpRequest(); +xhr.open("GET", url); +xhr.onload = function() { + gDataURL = "data:text/html;charset=utf-8," + + encodeURIComponent(this.responseText); + startNextTest(); +} +xhr.send(); +</script> +</body> +</html> diff --git a/docshell/test/tor_bug16620.html b/docshell/test/tor_bug16620.html new file mode 100644 index 0000000..a8e9050 --- /dev/null +++ b/docshell/test/tor_bug16620.html @@ -0,0 +1,51 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta charset="UTF-8"> + <title>Supporting Doc for Tor Bug 16620 Tests</title> +</head> +<body> +<a id="link" href="">secondDoc</a> + +<script type="application/javascript;version=1.7"> +// Extract test state from our query string, defaulting to +// "secondDocLoaded" to support use of this HTML content within +// a data URI (where query strings are not supported). +let state = (location.search.length > 0) ? location.search.substr(1) + : "secondDocLoaded"; + +// Notify the test driver. +opener.postMessage({ state: state, winName: window.name }, "*"); + +// Add a message event listener to process "openURL" actions. +window.addEventListener("message", function(aEvent) { + if (aEvent.data.action == "openURL") { + if (aEvent.data.noReferrerInMetaTag) { + let metaElem = document.createElement("meta"); + metaElem.name = "referrer"; + metaElem.content = "no-referrer"; + document.head.appendChild(metaElem); + } + + let linkElem = document.getElementById("link"); + linkElem.href = aEvent.data.url; + if (aEvent.data.noReferrerOnLink) + linkElem.rel = "noreferrer"; + + if (aEvent.data.resetInUnload) { + let tmpName = window.name; + window.addEventListener("unload", function() { + window.name = tmpName; + }, false); + } + + linkElem.click(); + } +}, false); +</script> +</body> +</html>

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] Bug #17207: Hide mime types and plugins when resisting fingerprinting
by gk＠torproject.org 31 Oct '15

31 Oct '15

commit 5ea30524fbf92005f236756646beb77684cd2008 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Oct 16 16:09:54 2015 -0700 Bug #17207: Hide mime types and plugins when resisting fingerprinting --- dom/base/nsMimeTypeArray.cpp | 19 +++++++++++++++++++ dom/base/nsPluginArray.cpp | 13 ++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dom/base/nsMimeTypeArray.cpp b/dom/base/nsMimeTypeArray.cpp index 257abf6..ee530a3 100644 --- a/dom/base/nsMimeTypeArray.cpp +++ b/dom/base/nsMimeTypeArray.cpp @@ -14,6 +14,7 @@ #include "nsIMIMEInfo.h" #include "Navigator.h" #include "nsServiceManagerUtils.h" +#include "nsContentUtils.h" using namespace mozilla; using namespace mozilla::dom; @@ -39,6 +40,12 @@ nsMimeTypeArray::~nsMimeTypeArray() { } +static bool +ResistFingerprinting() { + return !nsContentUtils::ThreadsafeIsCallerChrome() && + nsContentUtils::ResistFingerprinting(); +} + JSObject* nsMimeTypeArray::WrapObject(JSContext* aCx) { @@ -78,6 +85,10 @@ nsMimeTypeArray::IndexedGetter(uint32_t aIndex, bool &aFound) { aFound = false; + if (ResistFingerprinting()) { + return nullptr; + } + EnsurePluginMimeTypes(); if (aIndex >= mMimeTypes.Length()) { @@ -108,6 +119,10 @@ nsMimeTypeArray::NamedGetter(const nsAString& aName, bool &aFound) { aFound = false; + if (ResistFingerprinting()) { + return nullptr; + } + EnsurePluginMimeTypes(); nsString lowerName(aName); @@ -181,6 +196,10 @@ nsMimeTypeArray::NameIsEnumerable(const nsAString& aName) uint32_t nsMimeTypeArray::Length() { + if (ResistFingerprinting()) { + return 0; + } + EnsurePluginMimeTypes(); return mMimeTypes.Length(); diff --git a/dom/base/nsPluginArray.cpp b/dom/base/nsPluginArray.cpp index 1dcd551..8f789ee 100644 --- a/dom/base/nsPluginArray.cpp +++ b/dom/base/nsPluginArray.cpp @@ -20,6 +20,7 @@ #include "nsIWeakReference.h" #include "mozilla/Services.h" #include "nsIInterfaceRequestorUtils.h" +#include "nsContentUtils.h" using namespace mozilla; using namespace mozilla::dom; @@ -43,6 +44,12 @@ nsPluginArray::~nsPluginArray() { } +static bool +ResistFingerprinting() { + return !nsContentUtils::ThreadsafeIsCallerChrome() && + nsContentUtils::ResistFingerprinting(); +} + nsPIDOMWindow* nsPluginArray::GetParentObject() const { @@ -174,7 +181,7 @@ nsPluginArray::IndexedGetter(uint32_t aIndex, bool &aFound) { aFound = false; - if (!AllowPlugins()) { + if (!AllowPlugins() || ResistFingerprinting()) { return nullptr; } @@ -217,7 +224,7 @@ nsPluginArray::NamedGetter(const nsAString& aName, bool &aFound) { aFound = false; - if (!AllowPlugins()) { + if (!AllowPlugins() || ResistFingerprinting()) { return nullptr; } @@ -241,7 +248,7 @@ nsPluginArray::NameIsEnumerable(const nsAString& aName) uint32_t nsPluginArray::Length() { - if (!AllowPlugins()) { + if (!AllowPlugins() || ResistFingerprinting()) { return 0; }

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] Regression tests for Bug #17207: Hide mime types and plugins when resisting fingerprinting
by gk＠torproject.org 31 Oct '15

31 Oct '15

commit 5578785b6c12ff62b5a2cdcc3d2f5c9762af6c5c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Oct 16 17:10:57 2015 -0700 Regression tests for Bug #17207: Hide mime types and plugins when resisting fingerprinting --- dom/base/test/mochitest.ini | 1 + dom/base/test/test_tor_bug17207.html | 49 ++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini index 133348e..6a8c334 100644 --- a/dom/base/test/mochitest.ini +++ b/dom/base/test/mochitest.ini @@ -739,6 +739,7 @@ skip-if = toolkit == 'android' || e10s #RANDOM [test_title.html] [test_tor_bug15502.html] [test_tor_bug15703.html] +[test_tor_bug17207.html] [test_treewalker_nextsibling.xml] [test_viewport_scroll.html] [test_viewsource_forbidden_in_object.html] diff --git a/dom/base/test/test_tor_bug17207.html b/dom/base/test/test_tor_bug17207.html new file mode 100644 index 0000000..4ab0a0d --- /dev/null +++ b/dom/base/test/test_tor_bug17207.html @@ -0,0 +1,49 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Test for Tor Browser Bug 17207</title> + <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> +</head> +<body> +<p id="display"></p> +<div id="content"></div> + +<script class="testbody" type="application/javascript;version=1.7"> +SimpleTest.waitForExplicitFinish(); + +// __setPref(key, value)__. +// Set a pref value asynchronously, returning a promise that resolves +// when it succeeds. +let setPref = function* (key, value) { + return new Promise(function(resolve, reject) { + SpecialPowers.pushPrefEnv({"set": [[key, value]]}, resolve); + }); +}; + +// Run a test to see that we don't expose the supported mimeTypes +// or installed plugins when "privacy.resistFingerprinting" is active. +spawnTask(function* () { + yield setPref("privacy.resistFingerprinting", true); + is(navigator.mimeTypes["application/pdf"], undefined, "Don't reveal mime types"); + is(navigator.mimeTypes.length, 0, "navigator.mimeTypes.length should be 0"); + yield setPref("privacy.resistFingerprinting", false); + isnot(navigator.mimeTypes["application/pdf"], undefined), + // TODO: In Firefox 38, mimeTypes are not enumerable because of https://bugzilla.mozilla.org/757726. + // But mimeType enumeration was subsequently brought back by https://bugzilla.mozilla.org/1169945. + // So we'll need to include the following line in mozilla-central or TBB/FF45ESR: + // isnot(navigator.mimeTypes.length, 0, "navigator.mimeTypes.length should not be nonzero"); + // TODO: We don't have any plugins in Tor Browser, but we will need to implement + // similar tests for plugins in mainline Firefox. + SimpleTest.finish(); +}); + +</script> + +</body> +</html>

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit 517d9fec4b6d464d276410385942323124488255 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 26 18:05:33 2015 +0100 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug #17305: add the hardened channel --- toolkit/modules/debug.js | 1 + toolkit/mozapps/extensions/moz.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/toolkit/modules/debug.js b/toolkit/modules/debug.js index a30b586..486105e 100644 --- a/toolkit/modules/debug.js +++ b/toolkit/modules/debug.js @@ -42,6 +42,7 @@ this.NS_ASSERT = function NS_ASSERT(condition, message) { case "nightly": case "aurora": case "alpha": + case "hardened": case "beta": case "default": releaseBuild = false; diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build index c6a072c..58f8c3f 100644 --- a/toolkit/mozapps/extensions/moz.build +++ b/toolkit/mozapps/extensions/moz.build @@ -38,7 +38,7 @@ EXTRA_PP_JS_MODULES += [ 'AddonManager.jsm' ] -if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'alpha', 'beta', 'release', 'esr'): +if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'alpha', 'beta', 'hardened', 'release', 'esr'): DEFINES['MOZ_COMPATIBILITY_NIGHTLY'] = 1 # Additional debugging info is exposed in debug builds

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] fixup! Bug 13379: Sign our MAR files.
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit f799aa38f56abda676cacd8d435e16286edea772 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 26 18:09:28 2015 +0100 fixup! Bug 13379: Sign our MAR files. Bug #17305: add the hardened channel --- toolkit/mozapps/update/updater/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index 1f27acf..100a0df 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -15,7 +15,7 @@ endif include $(topsrcdir)/config/rules.mk -ifneq (,$(filter alpha beta release esr,$(MOZ_UPDATE_CHANNEL))) +ifneq (,$(filter alpha beta hardened release esr,$(MOZ_UPDATE_CHANNEL))) PRIMARY_CERT = release_primary.der SECONDARY_CERT = release_secondary.der else ifneq (,$(filter nightly aurora nightly-elm nightly-profiling nightly-oak nightly-ux,$(MOZ_UPDATE_CHANNEL)))

1 0

[tor-browser-bundle/master] updating the obfs4 key we ship
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit 360f726f02e214890ba9be4c6046ecaf0f655541 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 29 10:47:45 2015 +0000 updating the obfs4 key we ship --- gitian/gpg/obfs4proxy.gpg | Bin 34128 -> 41312 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/obfs4proxy.gpg b/gitian/gpg/obfs4proxy.gpg index b9c490a..f26a4cd 100644 Binary files a/gitian/gpg/obfs4proxy.gpg and b/gitian/gpg/obfs4proxy.gpg differ

1 0

[tor-browser-bundle/master] Bug 17428: Remove default Flashproxy bridges
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit fc32287aa1c0519998b31ab560ccccd45b0ea1df Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 30 09:01:41 2015 +0000 Bug 17428: Remove default Flashproxy bridges --- Bundle-Data/PTConfigs/bridge_prefs.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 8f8af9a..fa0d92f 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -8,12 +8,6 @@ pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); -pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1 4D6C0DF6DEC9398A4DEF07084F3CD395A96DD2AD"); -pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2 4D6C0DF6DEC9398A4DEF07084F3CD395A96DD2AD"); -pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3 4D6C0DF6DEC9398A4DEF07084F3CD395A96DD2AD"); -pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4 4D6C0DF6DEC9398A4DEF07084F3CD395A96DD2AD"); -pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5 4D6C0DF6DEC9398A4DEF07084F3CD395A96DD2AD"); - pref("extensions.torlauncher.default_bridge.fte.1", "fte 192.240.101.106:80 FDC5BA65D93B6BCA5EBDF8EF8E4FA936B7F1F8E5"); pref("extensions.torlauncher.default_bridge.fte.2", "fte 50.7.176.114:80 2BD466989944867075E872310EBAD65BC88C8AEF"); pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42");

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] Bug 1147248 - GCC 4.9 needs this patch to use address sanitizer. r=glandium
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit 4a90c975e0c251e073f5c218d72a8ce1a4087e97 Author: ISHIKAWA, Chiaki <ishikawa(a)yk.rim.or.jp> Date: Fri Apr 10 15:05:00 2015 +0200 Bug 1147248 - GCC 4.9 needs this patch to use address sanitizer. r=glandium --HG-- extra : rebase_source : 08c553d5b5ff76abd81b070ccd6e2f058a2c4e4b --- memory/mozalloc/mozalloc.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/memory/mozalloc/mozalloc.h b/memory/mozalloc/mozalloc.h index 2b370ec..a1479ad 100644 --- a/memory/mozalloc/mozalloc.h +++ b/memory/mozalloc/mozalloc.h @@ -203,7 +203,13 @@ MOZALLOC_EXPORT void* moz_valloc(size_t size) #define MOZALLOC_THROW_BAD_ALLOC MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS -MOZALLOC_EXPORT_NEW MOZALLOC_INLINE +MOZALLOC_EXPORT_NEW +#if defined(__GNUC__) && !defined(__clang__) && defined(__SANITIZE_ADDRESS__) +/* gcc's asan somehow doesn't like always_inline on this function. */ +__attribute__((gnu_inline)) inline +#else +MOZALLOC_INLINE +#endif void* operator new(size_t size) MOZALLOC_THROW_BAD_ALLOC { return moz_xmalloc(size);

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] Bug 1143411 - Fix build against latest freetype code. r=glandium
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit 4ac742c18b99d09d956cef5341ff5314ac4eba66 Author: NiLuJe <ninuje(a)gmail.com> Date: Wed Mar 18 19:32:53 2015 -0400 Bug 1143411 - Fix build against latest freetype code. r=glandium --HG-- extra : amend_source : 1d6310f206f4fbf0a0063b4d0affc7bc3d16273a --- config/system-headers | 1 + 1 file changed, 1 insertion(+) diff --git a/config/system-headers b/config/system-headers index 2c94a7d..4ab45e1 100644 --- a/config/system-headers +++ b/config/system-headers @@ -471,6 +471,7 @@ freetype/ftbitmap.h freetype/ftxf86.h freetype.h ftcache.h +ftfntfmt.h ftglyph.h ftsynth.h ftoutln.h

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] Updating .mozconfig-asan
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit 70309d6b89162b398d8ad2f13a9f1ea839b9fce9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 29 20:56:11 2015 +0000 Updating .mozconfig-asan --- .mozconfig-asan | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.mozconfig-asan b/.mozconfig-asan index 66e2dc1..218d2bd 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -1,17 +1,12 @@ . $topsrcdir/browser/config/mozconfig -export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fsanitize=undefined" -# When compiling with GCC 4.9.0 we need the libstdc++ either shipped with the -# bundles or link statically against it. We chose the latter as a) the -# resulting size of the bundle is smaller and b) there would probably occur -# issues with our Gitian setup as we compile GCC without LIBFAKETIME being set -# due to bug 11459. -export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fsanitize=undefined -static-libstdc++" -export LDFLAGS="-fsanitize=address -fsanitize=undefined" +export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +# We need to add -ldl explicitely due to bug 1213698 +export LDFLAGS="-fsanitize=address -ldl" -mk_add_option sMOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 @@ -25,7 +20,8 @@ ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update ac_add_options --enable-update-packaging -ac_add_options --disable-verify-mar +ac_add_options --enable-signmar +ac_add_options --enable-verify-mar ac_add_options --disable-strip ac_add_options --disable-install-strip @@ -35,3 +31,11 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc #ac_add_options --disable-ctypes +ac_add_options --disable-eme +# We disable generating the startup cache to avoid crashing during the packaging +# step due to Ubuntu Lucid being special: +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61408. +# Going this road and not backing out the feature responsible for this seems +# like the safer way even if it costs a bit start-up speed. But, hey, ASan +# builds are already slower. +ac_add_options --disable-startupcache

1 0

[tor-browser/tor-browser-38.3.0esr-5.5-2] Bug 1196381 - Eliminate breakpad dependency in ThreadStackHelper; r=nfroyd r=snorp The breakpad dependency in ThreadStackHelper is preventing us from upgrading our in-tree copy to a newer version (bug 1069556). This patch gets rid of that dependency. This makes native stack frames not work for BHR, but because of the ftp.m.o decommissioning, native symbolication was already broken and naive stack frames already don't work, so we don't really lose anyth
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit 8c4206f4325d87eaeb68372c462ff2749a1d82a1 Author: Jim Chen <nchen(a)mozilla.com> Date: Fri Sep 18 09:17:10 2015 -0400 Bug 1196381 - Eliminate breakpad dependency in ThreadStackHelper; r=nfroyd r=snorp The breakpad dependency in ThreadStackHelper is preventing us from upgrading our in-tree copy to a newer version (bug 1069556). This patch gets rid of that dependency. This makes native stack frames not work for BHR, but because of the ftp.m.o decommissioning, native symbolication was already broken and naive stack frames already don't work, so we don't really lose anything from this patch. Eventually we want to make ThreadStackHelper use other means of unwinding, such as LUL for Linux I added | #if 0 | around the code to fill the thread context, but left the code in because I think we'll evenually want to reuse some of that code. --- xpcom/threads/ThreadStackHelper.cpp | 169 ++--------------------------------- xpcom/threads/ThreadStackHelper.h | 1 - 2 files changed, 6 insertions(+), 164 deletions(-) diff --git a/xpcom/threads/ThreadStackHelper.cpp b/xpcom/threads/ThreadStackHelper.cpp index 07a8e2d..a937e7f 100644 --- a/xpcom/threads/ThreadStackHelper.cpp +++ b/xpcom/threads/ThreadStackHelper.cpp @@ -22,22 +22,6 @@ #include "mozilla/UniquePtr.h" #include "mozilla/MemoryChecking.h" -#ifdef MOZ_THREADSTACKHELPER_NATIVE -#include "google_breakpad/processor/call_stack.h" -#include "google_breakpad/processor/basic_source_line_resolver.h" -#include "google_breakpad/processor/stack_frame_cpu.h" -#include "processor/basic_code_module.h" -#include "processor/basic_code_modules.h" -#endif - -#if defined(MOZ_THREADSTACKHELPER_X86) -#include "processor/stackwalker_x86.h" -#elif defined(MOZ_THREADSTACKHELPER_X64) -#include "processor/stackwalker_amd64.h" -#elif defined(MOZ_THREADSTACKHELPER_ARM) -#include "processor/stackwalker_arm.h" -#endif - #if defined(MOZ_VALGRIND) # include <valgrind/valgrind.h> #endif @@ -286,67 +270,12 @@ ThreadStackHelper::GetStack(Stack& aStack) } #ifdef MOZ_THREADSTACKHELPER_NATIVE -class ThreadStackHelper::CodeModulesProvider - : public google_breakpad::CodeModules +class ThreadStackHelper::ThreadContext final { -private: - typedef google_breakpad::CodeModule CodeModule; - typedef google_breakpad::BasicCodeModule BasicCodeModule; - - const SharedLibraryInfo mLibs; - mutable ScopedDeletePtr<BasicCodeModule> mModule; - public: - CodeModulesProvider() : mLibs(SharedLibraryInfo::GetInfoForSelf()) {} - virtual ~CodeModulesProvider() {} - - virtual unsigned int module_count() const - { - return mLibs.GetSize(); - } - - virtual const CodeModule* GetModuleForAddress(uint64_t aAddress) const - { - MOZ_CRASH("Not implemented"); - } + // TODO: provide per-platform definition of Context. + typedef struct {} Context; - virtual const CodeModule* GetMainModule() const - { - return nullptr; - } - - virtual const CodeModule* GetModuleAtSequence(unsigned int aSequence) const - { - MOZ_CRASH("Not implemented"); - } - - virtual const CodeModule* GetModuleAtIndex(unsigned int aIndex) const - { - const SharedLibrary& lib = mLibs.GetEntry(aIndex); - mModule = new BasicCodeModule(lib.GetStart(), lib.GetEnd() - lib.GetStart(), - lib.GetName(), lib.GetBreakpadId(), - lib.GetName(), lib.GetBreakpadId(), ""); - // Keep mModule valid until the next GetModuleAtIndex call. - return mModule; - } - - virtual const CodeModules* Copy() const - { - MOZ_CRASH("Not implemented"); - } -}; - -class ThreadStackHelper::ThreadContext - : public google_breakpad::MemoryRegion -{ -public: -#if defined(MOZ_THREADSTACKHELPER_X86) - typedef MDRawContextX86 Context; -#elif defined(MOZ_THREADSTACKHELPER_X64) - typedef MDRawContextAMD64 Context; -#elif defined(MOZ_THREADSTACKHELPER_ARM) - typedef MDRawContextARM Context; -#endif // Limit copied stack to 4kB static const size_t kMaxStackSize = 0x1000; // Limit unwound stack to 32 frames @@ -369,38 +298,6 @@ public: , mStackBase(0) , mStackSize(0) , mStackEnd(nullptr) {} - virtual ~ThreadContext() {} - - virtual uint64_t GetBase() const { return uint64_t(mStackBase); } - virtual uint32_t GetSize() const { return mStackSize; } - virtual bool GetMemoryAtAddress(uint64_t aAddress, uint8_t* aValue) const - { - return GetMemoryAtAddressInternal(aAddress, aValue); - } - virtual bool GetMemoryAtAddress(uint64_t aAddress, uint16_t* aValue) const - { - return GetMemoryAtAddressInternal(aAddress, aValue); - } - virtual bool GetMemoryAtAddress(uint64_t aAddress, uint32_t* aValue) const - { - return GetMemoryAtAddressInternal(aAddress, aValue); - } - virtual bool GetMemoryAtAddress(uint64_t aAddress, uint64_t* aValue) const - { - return GetMemoryAtAddressInternal(aAddress, aValue); - } - -private: - template<typename T> - bool GetMemoryAtAddressInternal(uint64_t aAddress, T* aValue) const - { - const intptr_t offset = intptr_t(aAddress) - intptr_t(GetBase()); - if (offset < 0 || uintptr_t(offset) > (GetSize() - sizeof(T))) { - return false; - } - *aValue = *reinterpret_cast<const T*>(&mStack[offset]); - return true; - } }; #endif // MOZ_THREADSTACKHELPER_NATIVE @@ -417,63 +314,7 @@ ThreadStackHelper::GetNativeStack(Stack& aStack) GetStack(aStack); NS_ENSURE_TRUE_VOID(context.mValid); - CodeModulesProvider modulesProvider; - google_breakpad::BasicCodeModules modules(&modulesProvider); - google_breakpad::BasicSourceLineResolver resolver; - google_breakpad::StackFrameSymbolizer symbolizer(nullptr, &resolver); - -#if defined(MOZ_THREADSTACKHELPER_X86) - google_breakpad::StackwalkerX86 stackWalker( - nullptr, &context.mContext, &context, &modules, &symbolizer); -#elif defined(MOZ_THREADSTACKHELPER_X64) - google_breakpad::StackwalkerAMD64 stackWalker( - nullptr, &context.mContext, &context, &modules, &symbolizer); -#elif defined(MOZ_THREADSTACKHELPER_ARM) - google_breakpad::StackwalkerARM stackWalker( - nullptr, &context.mContext, -1, &context, &modules, &symbolizer); -#else - #error "Unsupported architecture" -#endif - - google_breakpad::CallStack callStack; - std::vector<const google_breakpad::CodeModule*> modules_without_symbols; - - google_breakpad::Stackwalker::set_max_frames(ThreadContext::kMaxStackFrames); - google_breakpad::Stackwalker:: - set_max_frames_scanned(ThreadContext::kMaxStackFrames); - - NS_ENSURE_TRUE_VOID(stackWalker.Walk(&callStack, &modules_without_symbols)); - - const std::vector<google_breakpad::StackFrame*>& frames(*callStack.frames()); - for (intptr_t i = frames.size() - 1; i >= 0; i--) { - const google_breakpad::StackFrame& frame = *frames[i]; - if (!frame.module) { - continue; - } - const string& module = frame.module->code_file(); -#if defined(XP_LINUX) || defined(XP_MACOSX) - const char PATH_SEP = '/'; -#elif defined(XP_WIN) - const char PATH_SEP = '\\'; -#endif - const char* const module_basename = strrchr(module.c_str(), PATH_SEP); - const char* const module_name = module_basename ? - module_basename + 1 : module.c_str(); - - char buffer[0x100]; - size_t len = 0; - if (!frame.function_name.empty()) { - len = PR_snprintf(buffer, sizeof(buffer), "%s:%s", - module_name, frame.function_name.c_str()); - } else { - len = PR_snprintf(buffer, sizeof(buffer), "%s:0x%p", - module_name, (intptr_t) - (frame.instruction - frame.module->base_address())); - } - if (len) { - aStack.AppendViaBuffer(buffer, len); - } - } + // TODO: walk the saved stack frames. #endif // MOZ_THREADSTACKHELPER_NATIVE } @@ -701,6 +542,7 @@ ThreadStackHelper::FillThreadContext(void* aContext) return; } +#if 0 // TODO: remove dependency on Breakpad structs. #if defined(XP_LINUX) const ucontext_t& context = *reinterpret_cast<ucontext_t*>(aContext); #if defined(MOZ_THREADSTACKHELPER_X86) @@ -858,6 +700,7 @@ ThreadStackHelper::FillThreadContext(void* aContext) mContextToFill->mStackBase = uintptr_t(sp); mContextToFill->mStackSize = stackSize; mContextToFill->mValid = true; +#endif #endif // MOZ_THREADSTACKHELPER_NATIVE } diff --git a/xpcom/threads/ThreadStackHelper.h b/xpcom/threads/ThreadStackHelper.h index b334f2f..9c40ad5 100644 --- a/xpcom/threads/ThreadStackHelper.h +++ b/xpcom/threads/ThreadStackHelper.h @@ -66,7 +66,6 @@ private: #ifdef MOZ_THREADSTACKHELPER_PSEUDO const PseudoStack* const mPseudoStack; #ifdef MOZ_THREADSTACKHELPER_NATIVE - class CodeModulesProvider; class ThreadContext; // Set to non-null if GetStack should get the thread context. ThreadContext* mContextToFill;

1 0

[tor-browser-bundle/master] Bug 17122: Rename Japanese OS X bundle
by gk＠torproject.org 30 Oct '15

30 Oct '15

commit 52afb5a8e99cbd117e14f40c5450b7cc26b04f18 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 29 12:25:56 2015 +0000 Bug 17122: Rename Japanese OS X bundle In order to avoid user confusion we change the locale part in the bundle name from `ja-JP-mac` to `ja` like it is on other platforms we support. The workings of Tor Browser on OS X are not affected as `ja-JP-mac` is used internally. --- gitian/descriptors/mac/gitian-bundle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index e3baa3c..458d613 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -276,6 +276,10 @@ script: | # MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/dmg/$DEST.app + # Rename the Japanese bundle to not confuse users + if [ "$LANG" = "ja-JP-mac" ]; then + LANG="ja" + fi ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/ rm -rf ~/build/dmg/$DEST.app done

1 0