- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 13328: Enabling PIE for ESR 31.
by gk＠torproject.org 06 Oct '14

06 Oct '14

commit fce458344a47b6ef88243b7eb6ff176d39d284d3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 6 18:31:13 2014 +0000 Bug 13328: Enabling PIE for ESR 31. --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 8f58353..27ba077 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -76,7 +76,9 @@ script: | cd $INSTDIR/gcc/bin cp /usr/bin/hardened-cc ./ mv gcc gcc.real + mv c++ c++.real ln -sf hardened-cc gcc + ln -sf hardened-cc c++ cd ~/build export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH ARCH=""

1 0

[tor-browser-bundle/master] Bug 13329: Enabling stack canaries for ESR 31.
by gk＠torproject.org 06 Oct '14

06 Oct '14

commit e5512159cafecfd2e8b46644ed67506bcac0f97d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 6 09:37:30 2014 +0000 Bug 13329: Enabling stack canaries for ESR 31. --- gitian/descriptors/linux/gitian-firefox.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 5d47b96..8f58353 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -72,6 +72,12 @@ script: | ln -sf ld.gold ld cd ~/build unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip + # Make sure we use the hardening wrapper when compiling Tor Browser. + cd $INSTDIR/gcc/bin + cp /usr/bin/hardened-cc ./ + mv gcc gcc.real + ln -sf hardened-cc gcc + cd ~/build export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH ARCH="" if [ $GBUILD_BITS == "64" ];

1 0

[tor-browser-bundle/master] Add meek-azure to transports list.
by mikeperry＠torproject.org 05 Oct '14

05 Oct '14

commit 9d57a89e45dfc7ebdb8cf56851b1cd15f13020ea Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Oct 4 16:31:13 2014 -0700 Add meek-azure to transports list. --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index a17a1be..d9c2049 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -32,3 +32,4 @@ pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.21 pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Upgrade go to 1.3.3.
by gk＠torproject.org 03 Oct '14

03 Oct '14

commit 23ce9c9c4ff773a216c2047f814f5b67b8243252 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 2 04:07:17 2014 +0000 Upgrade go to 1.3.3. https://groups.google.com/d/topic/golang-announce/MYS5MkDF5_A https://golang.org/doc/devel/release.html#go1.3 --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index 319a0de..3e5cffa 100755 --- a/gitian/versions +++ b/gitian/versions @@ -47,7 +47,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.1 -GO_VER=1.3 +GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -92,7 +92,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 +GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ccfb542..fe81f52 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -47,7 +47,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=5.0development.0 -GO_VER=1.3 +GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -92,7 +92,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 +GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index ca9d053..72a1365 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -47,7 +47,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.1 -GO_VER=1.3 +GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -94,7 +94,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 +GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 0617ea7..87136d9 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -49,7 +49,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=5.0development.0 -GO_VER=1.3 +GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -94,7 +94,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 +GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}

1 0

[tor-browser-bundle/master] Update FTE bridges, add IPv6 bridges.
by mikeperry＠torproject.org 02 Oct '14

02 Oct '14

commit 91c19fd898d25ba10d4531b91eb1591a08f1779c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 1 20:19:52 2014 -0700 Update FTE bridges, add IPv6 bridges. --- Bundle-Data/PTConfigs/bridge_prefs.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index b04e84e..a17a1be 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,14 +16,15 @@ pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3 pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); -// <ipv4> -pref("extensions.torlauncher.default_bridge.fte.1", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.6", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); -// </ipv4> +pref("extensions.torlauncher.default_bridge.fte.1", "fte 192.240.101.106:80 B629B0B607C8AC9349B5646C24E9D242184F5B6E"); +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"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.6", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); + +pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte [2001:49f0:d002:1::2]:80 B629B0B607C8AC9349B5646C24E9D242184F5B6E"); +pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1::c]:80 2BD466989944867075E872310EBAD65BC88C8AEF"); pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T");

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 01 Oct '14

01 Oct '14

commit 4c65088331460f35e4ec117a90f9a2bd7793e85b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 1 15:29:04 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Address Lunar's comments from tor-qa. --- browser/app/profile/000-tor-browser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 2d21fe8..0a16f35 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -65,7 +65,7 @@ pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Firefox/31.0"); pref("general.productSub.override", "20100101"); pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101"); @@ -139,7 +139,7 @@ pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", ""); // Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"privatebrowsing-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"fullscreen-button\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"social-share-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\"],\"newElementCount\":0}"); +pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"social-share-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"newElementCount\":0}"); // Omnibox settings pref("keyword.URL", "https://startpage.com/do/search?q=");

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 01 Oct '14

01 Oct '14

commit 02c2539e40cc173e10aa9be0bb707ba93cf0a69c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 1 15:17:51 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #13318: Reduce extra buttons on the toolbar. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c885dae..2d21fe8 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -138,6 +138,9 @@ pref("extensions.pendingOperations", false); pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", ""); +// Toolbar layout +pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"privatebrowsing-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"fullscreen-button\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"social-share-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\"],\"newElementCount\":0}"); + // Omnibox settings pref("keyword.URL", "https://startpage.com/do/search?q=");

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 12811: WTypes.h -> wtypes.h
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 557444bbe19e080dcfca20552f4dce7c0627c542 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 20 10:42:16 2014 +0000 Bug 12811: WTypes.h -> wtypes.h --- .../google-breakpad/src/google_breakpad/common/breakpad_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/crashreporter/google-breakpad/src/google_breakpad/common/breakpad_types.h b/toolkit/crashreporter/google-breakpad/src/google_breakpad/common/breakpad_types.h index a60c5f3..e92436f 100644 --- a/toolkit/crashreporter/google-breakpad/src/google_breakpad/common/breakpad_types.h +++ b/toolkit/crashreporter/google-breakpad/src/google_breakpad/common/breakpad_types.h @@ -58,7 +58,7 @@ */ #include BREAKPAD_CUSTOM_STDINT_H #else -#include <WTypes.h> +#include <wtypes.h> typedef unsigned __int8 uint8_t; typedef unsigned __int16 uint16_t;

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 10715: Enable Webgl for mingw-w64 again.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit c2a5e4b513677a02a57709a6fff4ed9d5d3629c3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 5 13:08:45 2014 +0000 Bug 10715: Enable Webgl for mingw-w64 again. --- .mozconfig-mingw | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.mozconfig-mingw b/.mozconfig-mingw index f3fc080..b4432e2 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -24,8 +24,4 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -# Accessibility now builds under MinGw. WebGL still doesn't :/. -#ac_add_options --disable-accessibility -ac_add_options --disable-webgl - #ac_add_options --disable-ctypes

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 1010972 - Don't use MSVC assembly on mingw. r=jesup
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 907c46f4c33704486b126236974548bb6b7720bc Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 17:24:49 2014 +0200 Bug 1010972 - Don't use MSVC assembly on mingw. r=jesup --- media/libyuv/source/cpu_id.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/libyuv/source/cpu_id.cc b/media/libyuv/source/cpu_id.cc index 84a362e..dec3abf 100644 --- a/media/libyuv/source/cpu_id.cc +++ b/media/libyuv/source/cpu_id.cc @@ -97,7 +97,7 @@ int TestOsSaveYmm() { uint32 xcr0 = 0u; #if defined(_MSC_VER) && defined(_XCR_XFEATURE_ENABLED_MASK) xcr0 = (uint32)(_xgetbv(_XCR_XFEATURE_ENABLED_MASK)); -#elif defined(_M_IX86) +#elif defined(_MSC_VER) && defined(_M_IX86) __asm { xor ecx, ecx // xcr 0 _asm _emit 0x0f _asm _emit 0x01 _asm _emit 0xd0 // For VS2010 and earlier.

1 0