- tbb-commits - lists.torproject.org

[tor-launcher/master] Bug #10418: Increase dialog height; fix typo.
by brade＠torproject.org 11 Mar '14

11 Mar '14

commit 60c933d5e260303a32df3417332357c2950f439b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 11 15:36:14 2014 -0400 Bug #10418: Increase dialog height; fix typo. --- src/chrome/content/network-settings-overlay.xul | 2 +- src/chrome/skin/network-settings.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index dc88655..6a85be4 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -81,7 +81,7 @@ <hbox align="baseline"> <spacer style="width: 1.9em" /> <label value="&torsettings.useBridges.type;" - control="firewallAllowedPorts"/> + control="defaultBridgeType" /> <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> <menupopup id="defaultBridgeType_menuPopup" /> </menulist> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index d34adcf..4873ca8 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -7,7 +7,7 @@ dialog { width: 45em; - height: 39em; + height: 41em; font: -moz-dialog; } @@ -17,7 +17,7 @@ dialog.os-windows { wizard { width: 43em; - height: 33em; + height: 34em; font: -moz-dialog; padding-top: 0px; }

1 0

[tor-launcher/master] Generalize Tor Browser strings to be independent of app.
by mikeperry＠torproject.org 11 Mar '14

11 Mar '14

commit a634ce616ddc88745c9da0447e055e693ca8523c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 11 11:07:37 2014 -0700 Generalize Tor Browser strings to be independent of app. We want to allow Tor Launcher to work in Tor Browser, Tails, Thunderbird, and Instantbird with minimal modifications. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- src/chrome/locale/en/progress.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index a779d9a..a346274 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -1,8 +1,8 @@ -<!ENTITY torsettings.dialog.title "Tor Browser Network Settings"> +<!ENTITY torsettings.dialog.title "Tor Network Settings">  -<!ENTITY torsettings.prompt "Before the Tor Browser tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> <!ENTITY torSettings.no "No"> diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/locale/en/progress.dtd index 16491f9..f4395cf 100644 --- a/src/chrome/locale/en/progress.dtd +++ b/src/chrome/locale/en/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established."> +<!ENTITY torprogress.pleaseWait "Please wait while a connection to the Tor network is established.">

1 0

[tor-launcher/master] Change "default bridges" to "provided bridges" everywhere.
by mikeperry＠torproject.org 11 Mar '14

11 Mar '14

commit 280646446dd3844185d30d1f9586070af19ff95f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 10 23:18:32 2014 -0700 Change "default bridges" to "provided bridges" everywhere. Sorry translation team, but it is better to do this now than later. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- src/chrome/locale/en/torlauncher.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 62afab4..a779d9a 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -24,7 +24,7 @@ <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  @@ -55,7 +55,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 38d314a..a2550db 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Please ensure that Tor is running. torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. torlauncher.error_proxy_type_missing=You must select the proxy type. torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges. -torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.recommended_bridge=(recommended)

1 0

[tor-launcher/master] Bug 10418: Improve layout and strings
by mikeperry＠torproject.org 10 Mar '14

10 Mar '14

commit 8748fdb1006a811eb5864be36108be4f2b5d0a8a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 10 16:27:11 2014 -0700 Bug 10418: Improve layout and strings The layout may still need some work, but at least these strings are in better shape in terms of usability and future changes like #11071. --- src/chrome/content/network-settings-overlay.xul | 23 +++++++++++++---------- src/chrome/locale/en/network-settings.dtd | 9 +++++---- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 29c3bb3..dc88655 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -76,25 +76,28 @@ <groupbox id="bridgeSpecificSettings"> <hbox pack="end"> <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px"> - <hbox align="center"> <radio id="bridgeRadioDefault" label="&torsettings.useBridges.default;" selected="true" /> - <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> + <hbox align="baseline"> + <spacer style="width: 1.9em" /> + <label value="&torsettings.useBridges.type;" + control="firewallAllowedPorts"/> + <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> <menupopup id="defaultBridgeType_menuPopup" /> - </menulist> - <spring/> - </hbox> + </menulist> + <spring/> + </hbox> <spacer style="height: 0.5em" /> - <radio id="bridgeRadioCustom" label="&torsettings.useBridges.custom;" + <hbox align="baseline" flex="1"> + <radio align="start" id="bridgeRadioCustom" label="&torsettings.useBridges.custom;" oncommand="onCustomBridges()" /> + <button align="end" dlgtype="help" oncommand="onOpenHelp()" /> + </hbox> </radiogroup> - <vbox pack="start"> - <button dlgtype="help" oncommand="onOpenHelp()" /> - </vbox> </hbox> <vbox id="bridgeCustomEntry"> - <label style="margin-top:0px;" + <label style="margin-top:0px;" value="&torsettings.useBridges.label;" control="bridgeList"/> <textbox id="bridgeList" multiline="true" rows="3" oninput="onCustomBridgesTextInput();" diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 4e21541..62afab4 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -1,8 +1,8 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor Browser Network Settings">  -<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Before the Tor Browser tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> <!ENTITY torSettings.no "No"> @@ -46,8 +46,9 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Use default bridges of type"> -<!ENTITY torsettings.useBridges.custom "Use custom bridges"> +<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> <!ENTITY torsettings.useBridges.placeholder "type address:port">

1 0

[tor-launcher/master] Bug #10418: Use Sentence case for radio button labels.
by brade＠torproject.org 10 Mar '14

10 Mar '14

commit 848d698d8c832a88c5c0bc26d87a786cf6f4b6c1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 10 14:35:59 2014 -0400 Bug #10418: Use Sentence case for radio button labels. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index dca8d53..4e21541 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -46,8 +46,8 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type"> -<!ENTITY torsettings.useBridges.custom "Use Custom Bridges"> +<!ENTITY torsettings.useBridges.default "Use default bridges of type"> +<!ENTITY torsettings.useBridges.custom "Use custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> <!ENTITY torsettings.useBridges.placeholder "type address:port">

1 0

[tor-browser-bundle/master] Bug 4261: Fix DMG permissions to work from /Applications
by mikeperry＠torproject.org 08 Mar '14

08 Mar '14

commit fb9453c51306ad39d261617e2cb3ba8e18368574 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 8 13:46:23 2014 -0800 Bug 4261: Fix DMG permissions to work from /Applications Only seems to matter on some Mac versions... Very odd. --- gitian/build-helpers/ddmg.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index 468d6be..c37a1fd 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -5,14 +5,17 @@ export LC_ALL=C DMGFILE=$1 shift -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; +# We need group readability for some Macs to be able to handle /Applications +# installation. Still unclear exactly why this is -- it is not dependent on +# OSX version... +find $@ -executable -exec chmod 750 {} \; +find $@ ! -executable -exec chmod 640 {} \; cd $@ find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt -mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -dir-mode 0700 -new-dir-mode 0700 +mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 cd ~/build

1 0

[tor-browser-bundle/master] Update tags for Torbutton and Tor Browser.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit ffd28013c92b64a73ba985b708f47aa30e450063 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:52:06 2014 -0800 Update tags for Torbutton and Tor Browser. --- gitian/versions | 6 +++--- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/versions b/gitian/versions index 7f367a0..4f1d1c8 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,12 +1,12 @@ -TORBROWSER_VERSION=3.5.2.1 +TORBROWSER_VERSION=3.5.3 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 76182b7..83febef 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,10 +4,10 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.5.2-alpha TORLAUNCHER_TAG=0.2.5.0 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.beta b/gitian/versions.beta index 94ada7c..fd4a715 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -4,10 +4,10 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.0 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/master] Add a changelog entry for 3.6-beta-1.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f0fa0845fd19cdba5c1cdc2751d1fbe4e682684e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:27:25 2014 -0800 Add a changelog entry for 3.6-beta-1. --- Bundle-Data/Docs/ChangeLog.txt | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 657db38..ccf31b0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,33 @@ +Tor Browser Bundle 3.6-beta-1 -- Mar 12 2014 + * All Platforms + * Include Pluggable Transports by default: + * Obfsproxy3 0.2.4, Flashproxy 1.6, and FTE 0.2.6 are now included + * Update Tor Launcher to 0.2.5.0 + * Bug 10418: Provide UI configuration for Pluggable Transports + * Bug 10604: Allow Tor status & error messages to be translated + * Bug 10894: Make bridge UI clear that helpdesk is a last resort for + bridges + * Bug 10610: Clarify wizard UI text describing obstacles/blocking + * Bug 11074: Support Tails use case (XULRunner and optional + customizations) + * Update Torbutton to 1.6.7.0: + * Bug 9901: Fix browser freeze due to content type sniffing + * Bug 10611: Add Swedish (sv) to extra locales to update + * Update NoScript to 2.6.8.17 + * Update Tor to 0.2.4.21 + * Backport Pending Tor Patches: + * Bug 5018: Don't launch Pluggable Transport helpers if not in use + * Bug 11069: Detect and report Pluggable Transport bootstrap failures + * Bug 10237: Disable the media cache to prevent disk leaks for videos + * Bug 10703: Force the default charset to avoid locale fingerprinting + * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) + * Mac: + * Bug 4271: Use DMG instead of ZIP for Mac packages + * Linux: + * Bug 9533: Fix keyboard input on Ubuntu 13.10 + * Bug 9896: Provide debug symbols for Tor Browser binary + * Bug 10472: Pass arguments to the browser from Linux startup script + Tor Browser Bundle 3.5.2.1 -- Feb 14 2014 * All Platforms * Bug 10895: Fix broken localized bundles

1 0

[tor-launcher/master] Bugs 10867, 10900: Bug Add eu, sv, and ja to extra locales
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f9759b66e964c05188b9bd0adced5e06c005f09d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 13 16:55:37 2014 +0000 Bugs 10867,10900: Bug Add eu, sv, and ja to extra locales I swear I committed eu and ja before as bug #10687.. --- localization/import-translations.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index 3096168..8d30a7d 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -1,6 +1,13 @@ #!/bin/sh -BUNDLE_LOCALES="ar de es fa fr it ja ko nl pl pt ru vi zh-CN" +BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru vi zh-CN" + +# XXX: Basque (eu) by request in #10687. +# This is not used for official builds, but should remain +# so Basque XPIs can be build independently. We can do +# this for other languages too, if anyone requests this +# and translations are available. +BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv" if [ -d translation ]; then

1 0

[torbutton/master] Changelog and version bump for 1.6.7.0.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 4a9d180fc8b97f38c51089a85305da2d6765eb15 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:48:54 2014 -0800 Changelog and version bump for 1.6.7.0. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index acbc736..321e2b9 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.6.7.0: + 7 Mar 2014: + * Bug 9901: Fix browser freeze due to content type sniffing + * Bug 10611: Add Swedish (sv) to extra locales to update + 1.6.6.0: 3 Feb 2014 * Bug #10800: Prevent exception in New Identity diff --git a/src/install.rdf b/src/install.rdf index e183f91..0c8c486 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.6.0</em:version> + <em:version>1.6.7.0</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