September 2016 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Bumping OpenSSL for nightlies again
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 143d1c0bbda2408993790e160975eaf95d7ad145 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 12:13:22 2016 +0000 Bumping OpenSSL for nightlies again --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c435a47..295d507 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -51,7 +51,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.2i +OPENSSL_VER=1.0.2j GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -104,7 +104,7 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f +OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[torbutton/master] Bug 17904: Allow P&S Settings dialog to resize
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit b1adcba17a96a925345001d4da69cb71b469e3ed Author: arthuredelstein(a)gmail.com <arthuredelstein(a)gmail.com> Date: Thu Sep 15 16:23:58 2016 -0700 Bug 17904: Allow P&S Settings dialog to resize If the dialog is too small to show all descriptions, then the descriptions text area will show a scrollbar. --- src/chrome/content/preferences.js | 4 -- src/chrome/content/preferences.xul | 99 ++++++++++++++++++++------------------ 2 files changed, 51 insertions(+), 52 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index fb5aafd..ee81568 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -9,7 +9,6 @@ const Cc = Components.classes, Ci = Components.interfaces; function torbutton_prefs_init(doc) { torbutton_log(2, "called prefs_init()"); - sizeToContent(); var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); @@ -184,9 +183,6 @@ function torbutton_set_slider_text(doc, custom) { doc.getElementById("desc_high").collapsed = true; break; } - // It can happen that the descriptions of the slider settings consume more - // space than originally allocated. Adapt the dialog size accordingly. - sizeToContent(); } function torbutton_prefs_check_disk() { diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index baa6093..8474871 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -11,13 +11,15 @@ buttons="accept,cancel,extra1" buttonlabelextra1="&torbutton.prefs.restore_defaults;" ondialogextra1="torbutton_prefs_reset_defaults();" - persist="screenX screenY" + persist="screenX screenY width height" onload="torbutton_prefs_init(document)" + align="stretch" + pack="center" ondialogaccept="torbutton_prefs_save(document)" > <script type="application/x-javascript" src="torbutton_util.js"/> <script type="application/x-javascript" src="preferences.js"/> - <vbox> + <vbox flex="1" align="stretch"> <groupbox> <caption label="&torbutton.prefs.priv_caption;" tooltiptext="&torbutton.prefs.priv_caption_tooltip;"/> @@ -35,49 +37,58 @@ label="&torbutton.prefs.resist_fingerprinting;" tooltiptext="&torbutton.prefs.resist_fingerprinting_tooltip;"/> </groupbox> - <spacer flex="1"/> - <groupbox> - <caption label="&torbutton.prefs.sec_caption;" - tooltiptext="&torbutton.prefs.sec_caption_tooltip;"/> - <hbox> - <vbox height="200"> - <scale id="torbutton_sec_slider" flex="1" min="1" max="4" - movetoclick="true" orient="vertical"/> - </vbox> - <vbox height="200"> - <hbox flex="1" align="start"> - <description id="torbutton_sec_high" - tooltip="high_preview" - onclick="torbutton_toggle_slider(document, 1);"> - &torbutton.prefs.sec_high; - </description> + <groupbox align="stretch" flex="1">  + <caption label="&torbutton.prefs.sec_caption;"/> + <hbox flex="1" align="stretch"> + <vbox> + <hbox height="200"> + <vbox> + <scale id="torbutton_sec_slider" flex="1" min="1" max="4" + movetoclick="true" orient="vertical"/> + </vbox> + <vbox> + <hbox flex="1" align="start"> + <description id="torbutton_sec_high" + tooltip="high_preview" + onclick="torbutton_toggle_slider(document, 1);"> + &torbutton.prefs.sec_high; + </description> + </hbox> + <hbox flex="1" align="center"> + <description id="torbutton_sec_med_high" + tooltip="mh_preview" + onclick="torbutton_toggle_slider(document, 2);"> + &torbutton.prefs.sec_med_high; + </description> + </hbox> + <hbox flex="1" align="center"> + <description id="torbutton_sec_med_low" + tooltip="ml_preview" + onclick="torbutton_toggle_slider(document, 3);"> + &torbutton.prefs.sec_med_low; + </description> + </hbox> + <hbox flex="1" align="end"> + <description id="torbutton_sec_low" + tooltip="low_preview" + onclick="torbutton_toggle_slider(document, 4);"> + &torbutton.prefs.sec_low; + </description> + </hbox> + </vbox> </hbox> - <hbox flex="1" align="center"> - <description id="torbutton_sec_med_high" - tooltip="mh_preview" - onclick="torbutton_toggle_slider(document, 2);"> - &torbutton.prefs.sec_med_high; - </description> - </hbox> - <hbox flex="1" align="center"> - <description id="torbutton_sec_med_low" - tooltip="ml_preview" - onclick="torbutton_toggle_slider(document, 3);"> - &torbutton.prefs.sec_med_low; - </description> - </hbox> - <hbox flex="1" align="end"> - <description id="torbutton_sec_low" - tooltip="low_preview" - onclick="torbutton_toggle_slider(document, 4);"> - &torbutton.prefs.sec_low; - </description> + <hbox> +  + <checkbox id="torbutton_sec_custom" flex="1" + oncommand="torbutton_set_slider_text(document, event.target.checked);" + label="&torbutton.prefs.sec_custom;"/> </hbox> </vbox> - <spacer flex="1"/>  - <vbox flex="1" width="300"> + <vbox flex="1" width="300" style="overflow: auto;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight"> @@ -179,14 +190,6 @@ </vbox> </vbox> </hbox> - <hbox> -  - <checkbox id="torbutton_sec_custom" flex="1" - oncommand="torbutton_set_slider_text(document, event.target.checked);" - label="&torbutton.prefs.sec_custom;"/> - </hbox> </groupbox> </vbox>

1 0

[torbutton/master] Bug 17546: Tooltips for Privacy Settings checkboxes
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit c8a04a79d7371b30622c727366ba5584569d4ffb Author: arthuredelstein(a)gmail.com <arthuredelstein(a)gmail.com> Date: Thu Sep 22 17:00:40 2016 -0700 Bug 17546: Tooltips for Privacy Settings checkboxes --- src/chrome/content/preferences.xul | 20 +++++++++++++------- src/chrome/locale/en/torbutton.dtd | 6 ++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 8ea448c..baa6093 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -19,20 +19,26 @@ <script type="application/x-javascript" src="preferences.js"/> <vbox> <groupbox> - <caption label="&torbutton.prefs.priv_caption;"/> + <caption label="&torbutton.prefs.priv_caption;" + tooltiptext="&torbutton.prefs.priv_caption_tooltip;"/> <checkbox id="torbutton_blockDisk" label="&torbutton.prefs.block_disk;" - oncommand="torbutton_prefs_check_disk();"/> + oncommand="torbutton_prefs_check_disk();" + tooltiptext="&torbutton.prefs.block_disk_tooltip;"/> <checkbox id="torbutton_blockPlugins" - label="&torbutton.prefs.block_plugins;"/> + label="&torbutton.prefs.block_plugins;" + tooltiptext="&torbutton.prefs.block_plugins_tooltip;"/> <checkbox id="torbutton_restrictThirdParty" - label="&torbutton.prefs.restrict_thirdparty;"/> + label="&torbutton.prefs.restrict_thirdparty;" + tooltiptext="&torbutton.prefs.restrict_thirdparty_tooltip;"/> <checkbox id="torbutton_resistFingerprinting" - label="&torbutton.prefs.resist_fingerprinting;"/> + label="&torbutton.prefs.resist_fingerprinting;" + tooltiptext="&torbutton.prefs.resist_fingerprinting_tooltip;"/> </groupbox> <spacer flex="1"/> <groupbox> - <caption label="&torbutton.prefs.sec_caption;"/> + <caption label="&torbutton.prefs.sec_caption;" + tooltiptext="&torbutton.prefs.sec_caption_tooltip;"/> <hbox> <vbox height="200"> <scale id="torbutton_sec_slider" flex="1" min="1" max="4" @@ -168,7 +174,7 @@ &torbutton.prefs.sec_low_desc; </description> <description class="slider-text-size"> - &torbutton.prefs.sec_low_usable_desc; + &torbutton.prefs.sec_low_usable_desc; </description> </vbox> </vbox> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 4bca4c7..81ca8f4 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -25,11 +25,17 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> +<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use."> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> +<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites."> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> +<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track."> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "Security Level"> +<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> <!ENTITY torbutton.prefs.sec_low "Low (default)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">

1 0

[tor-browser-bundle/hardened-builds] Bug 15852: Remove/synchronize Torbutton SOCKS pref logic
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 36842fddafcf79bab6911def2ec4133826bc28f9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Sep 19 12:02:21 2016 -0400 Bug 15852: Remove/synchronize Torbutton SOCKS pref logic Remove from extension-overrides.js the Torbutton preferences that are no longer used. --- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- 3 files changed, 27 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true);

1 0

[tor-browser-bundle/master] Bug 15852: Remove/synchronize Torbutton SOCKS pref logic
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 0a5e21b00533960317352ac27db996258544eac6 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Sep 19 12:02:21 2016 -0400 Bug 15852: Remove/synchronize Torbutton SOCKS pref logic Remove from extension-overrides.js the Torbutton preferences that are no longer used. --- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- 3 files changed, 27 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true);

1 0

[tor-browser-bundle/hardened-builds] Nightly version bumps
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit ef8d6d484d0bbd4692e882cd1f2eeda1efe437d0 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 07:52:19 2016 +0000 Nightly version bumps Tor Browser 45.4.0 and OpenSSL 1.0.2i --- gitian/versions.nightly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 99d7d7e..d99711c 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.3.0esr +FIREFOX_VERSION=45.4.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -52,7 +52,7 @@ SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.2h +OPENSSL_VER=1.0.2i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -107,7 +107,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 +OPENSSL_HASH=9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[tor-browser-bundle/master] Nightly version bumps
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 97aa7318fce7df592d2c25955f2e76cff6f3480c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 07:52:19 2016 +0000 Nightly version bumps Tor Browser 45.4.0 and OpenSSL 1.0.2i --- gitian/versions.nightly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index fe6c738..c435a47 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.3.0esr +FIREFOX_VERSION=45.4.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -51,7 +51,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.2h +OPENSSL_VER=1.0.2i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -104,7 +104,7 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 +OPENSSL_HASH=9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[tor-browser-bundle/master] Fold in 6.5a3-hardened changelog
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 71a5fe16d317c26b2391739b56afb6e99063d304 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 07:39:40 2016 +0000 Fold in 6.5a3-hardened changelog --- Bundle-Data/Docs/ChangeLog.txt | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 881f25f..100ac48 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,39 @@ +Tor Browser 6.5a3-hardened -- September 20 2016 + * All Platforms + * Update Firefox to 45.4.0esr + * Update Tor to 0.2.9.2-alpha + * Update OpenSSL to 1.0.2h (bug 20095) + * Update Torbutton to 1.9.6.4 + * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git + * Bug 17767: Make "JavaScript disabled" more visible in Security Slider + * Bug 19995: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + * Bug 19837: Whitelist internal URLs that Firefox requires for media + * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic + * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 + * Bug 14271: Make Torbutton work with Unix Domain Socket option + * Translation updates + * Update Tor Launcher to 0.2.11 + * Bug 14272: Make Tor Launcher work with Unix Domain Socket option + * Bug 19568: Set CurProcD for Thunderbird/Instantbird + * Bug 19432: Remove special handling for Instantbird/Thunderbird + * Translation updates + * Update HTTPS-Everywhere to 5.2.4 + * Update NoScript to 2.9.0.14 + * Bug 19851: Fix ASan error by upgrading GCC to 5.4.0 + * Bug 17858: Fix creation of incremental MARs for hardened builds + * Bug 14273: Backport patches for Unix Domain Socket support + * Bug 19890: Disable installation of system addons + * Bug 17334: Spoof referrer when leaving a .onion domain + * Bug 20092: Rotate ports for default obfs4 bridges + * Bug 20040: Add update support for unpacked HTTPS Everywhere + * Bug 20118: Don't unpack HTTPS Everywhere anymore + * Bug 19336+19835: Enhance about:tbupdate page + * Build system + * All platforms + * Bug 20133: Don't apply OpenSSL patch anymore + * Bug 19528: Set MOZ_BUILD_DATE based on Firefox version + Tor Browser 6.5a3 -- September 20 2016 * All Platforms * Update Firefox to 45.4.0esr

1 0

[tor-browser-bundle/hardened-builds] We are on the hardened track
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit c72cb6b6cd1371969a614061aa7a8bcb7bf822d5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 07:38:19 2016 +0000 We are on the hardened track --- 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 ff3164f..68a9d43 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 6.5a3 -- September 20 2016 +Tor Browser 6.5a3-hardened -- September 20 2016 * All Platforms * Update Firefox to 45.4.0esr * Update Tor to 0.2.9.2-alpha

1 0

[goptlib/master] pt-spec no longer mentions SIGINT.
by dcf＠torproject.org 25 Sep '16

25 Sep '16

commit 50915b3ba5ee27c0b2fcdad9edd51156fb55192c Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 25 18:33:10 2016 -0700 pt-spec no longer mentions SIGINT. --- examples/dummy-client/dummy-client.go | 22 ++++++++-------------- examples/dummy-server/dummy-server.go | 22 ++++++++-------------- pt.go | 2 +- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index 74843fd..a15189c 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -114,9 +114,9 @@ func main() { var numHandlers int = 0 var sig os.Signal sigChan := make(chan os.Signal, 1) - signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) + signal.Notify(sigChan, syscall.SIGTERM) - // wait for first signal + // keep track of handlers and wait for a signal sig = nil for sig == nil { select { @@ -125,21 +125,15 @@ func main() { case sig = <-sigChan: } } + + // signal received, shut down for _, ln := range listeners { ln.Close() } - - if sig == syscall.SIGTERM { - return - } - - // wait for second signal or no more handlers - sig = nil - for sig == nil && numHandlers != 0 { - select { - case n := <-handlerChan: - numHandlers += n - case sig = <-sigChan: + for n := range handlerChan { + numHandlers += n + if numHandlers == 0 { + break } } } diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index 933630b..c31c63f 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -106,9 +106,9 @@ func main() { var numHandlers int = 0 var sig os.Signal sigChan := make(chan os.Signal, 1) - signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) + signal.Notify(sigChan, syscall.SIGTERM) - // wait for first signal + // keep track of handlers and wait for a signal sig = nil for sig == nil { select { @@ -117,21 +117,15 @@ func main() { case sig = <-sigChan: } } + + // signal received, shut down for _, ln := range listeners { ln.Close() } - - if sig == syscall.SIGTERM { - return - } - - // wait for second signal or no more handlers - sig = nil - for sig == nil && numHandlers != 0 { - select { - case n := <-handlerChan: - numHandlers += n - case sig = <-sigChan: + for n := range handlerChan { + numHandlers += n + if numHandlers == 0 { + break } } } diff --git a/pt.go b/pt.go index 82c42d5..20917a4 100644 --- a/pt.go +++ b/pt.go @@ -113,7 +113,7 @@ // pt.SmethodsDone() // } // -// Some additional care is needed to handle SIGINT and shutdown properly. See +// Some additional care is needed to handle signals and shutdown properly. See // the example programs dummy-client and dummy-server. // // Tor pluggable transports specification:

1 0