tbb-commits

tbb-commits@lists.torproject.org

1 participants
17624 discussions

[tor-browser-bundle/master] Switch to obfs4proxy-0.0.4, and remove references to go.crypto.
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit dd5f93f2fc8721ee83f1dbe650a877fe68b1b43a Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Feb 17 12:41:24 2015 +0000 Switch to obfs4proxy-0.0.4, and remove references to go.crypto. The new version of obfs4proxy uses golang.org/x/crypto, which has been already integrated as part of the nightly build process, so this is a tag change and removal of the deprecated library only. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 12 ------------ gitian/descriptors/mac/gitian-pluggable-transports.yml | 12 ------------ gitian/descriptors/windows/gitian-pluggable-transports.yml | 12 ------------ gitian/fetch-inputs.sh | 5 ++--- gitian/verify-tags.sh | 2 +- gitian/versions.alpha | 5 +---- gitian/versions.nightly | 3 --- 7 files changed, 4 insertions(+), 47 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index d180f97..9596b7f 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -54,7 +54,6 @@ files: - "gmp-linux64-utils.zip" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" -- "go.crypto.tar.bz2" - "go.net.tar.bz2" script: | INSTDIR="$HOME/install" @@ -254,17 +253,6 @@ script: | go install golang.org/x/crypto/nacl/secretbox cd .. - # Building go.crypto (obfs4proxy <= 0.0.3) - tar xjf go.crypto.tar.bz2 - cd go.crypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.crypto" - go install code.google.com/p/go.crypto/curve25519 - go install code.google.com/p/go.crypto/hkdf - go install code.google.com/p/go.crypto/nacl/secretbox - cd .. - # Building go.net tar xjf go.net.tar.bz2 cd go.net diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 9a86b1a..a1bdff9 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -50,7 +50,6 @@ files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" -- "go.crypto.tar.bz2" - "go.net.tar.bz2" - "gmp-mac64-utils.zip" - "openssl-mac64-utils.zip" @@ -282,17 +281,6 @@ script: | go install golang.org/x/crypto/nacl/secretbox cd .. - # Building go.crypto (obfs4proxy <= 0.0.3) - tar xjf go.crypto.tar.bz2 - cd go.crypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.crypto" - go install code.google.com/p/go.crypto/curve25519 - go install code.google.com/p/go.crypto/hkdf - go install code.google.com/p/go.crypto/nacl/secretbox - cd .. - # Building go.net tar xjf go.net.tar.bz2 cd go.net diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 6e3c3a7..4ca477e 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -57,7 +57,6 @@ files: - "openssl-win32-utils.zip" - "gmp-win32-utils.zip" - "gcclibs-win32-utils.zip" -- "go.crypto.tar.bz2" - "go.net.tar.bz2" script: | # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. @@ -360,17 +359,6 @@ script: | go install golang.org/x/crypto/nacl/secretbox cd .. - # Building go.crypto (obfs4proxy <= 0.0.3) - tar xjf go.crypto.tar.bz2 - cd go.crypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.crypto" - go install code.google.com/p/go.crypto/curve25519 - go install code.google.com/p/go.crypto/hkdf - go install code.google.com/p/go.crypto/nacl/secretbox - cd .. - # Building go.net tar xjf go.net.tar.bz2 cd go.net diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index fdbbc69..e58c4d3 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -165,7 +165,7 @@ done # XXX/Yawning. As far as I can tell, this gitian thing doesn't support # fetching from hg repositories. -for i in GOCRYPTO GONET +for i in GONET do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL_YAWNING}${!PACKAGE}" @@ -178,7 +178,7 @@ wget -U "" -N ${HTTPSE_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GOCRYPTO GONET +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -233,7 +233,6 @@ ln -sf "$LXML_PACKAGE" lxml.tar.gz ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz ln -sf "$GONET_PACKAGE" go.net.tar.bz2 -ln -sf "$GOCRYPTO_PACKAGE" go.crypto.tar.bz2 # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index df30143..eb1e057 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -140,7 +140,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GOCRYPTO GONET +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e5668f2..0e258aa 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -30,7 +30,7 @@ FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 -OBFS4_TAG=obfs4proxy-0.0.3 +OBFS4_TAG=obfs4proxy-0.0.4 GITIAN_TAG=tor-browser-builder-3.x-7 @@ -78,7 +78,6 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -GOCRYPTO_PACKAGE=go.crypto-5478be1963aa.tar.bz2 GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2 # Hashes for packages with weak sigs or no sigs @@ -101,7 +100,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e -GOCRYPTO_HASH=a8e301714f5724999321f0397b867a5670a5e5c4f808ba157bdd93ee0d028827 GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353 ## Non-git package URLs @@ -128,5 +126,4 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=http://golang.org/dl/${GO_PACKAGE} -GOCRYPTO_URL=https://people.torproject.org/~yawning/mirrors/sources/${GOCRYPTO_PACKAGE} GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PA… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 16519f5..a619cad 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -82,7 +82,6 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -GOCRYPTO_PACKAGE=go.crypto-5478be1963aa.tar.bz2 GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2 # Hashes for packages with weak sigs or no sigs @@ -105,7 +104,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e -GOCRYPTO_HASH=a8e301714f5724999321f0397b867a5670a5e5c4f808ba157bdd93ee0d028827 GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353 ## Non-git package URLs @@ -132,5 +130,4 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=http://golang.org/dl/${GO_PACKAGE} -GOCRYPTO_URL=https://people.torproject.org/~yawning/mirrors/sources/${GOCRYPTO_PACKAGE} GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PA…

1 0

[tor-browser-bundle/master] Merge branch 'bug14919'
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit c268ca1dab6a1dbcd106da29c47390c9d834b420 Merge: 0119a3c 092dbbf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 18 13:33:50 2015 +0000 Merge branch 'bug14919' Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 5 +---- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 5 +---- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 5 +---- gitian/descriptors/linux/gitian-pluggable-transports.yml | 12 ------------ gitian/descriptors/mac/gitian-pluggable-transports.yml | 12 ------------ gitian/descriptors/windows/gitian-pluggable-transports.yml | 12 ------------ gitian/fetch-inputs.sh | 5 ++--- gitian/verify-tags.sh | 2 +- gitian/versions.alpha | 5 +---- gitian/versions.nightly | 3 --- 10 files changed, 7 insertions(+), 59 deletions(-)

1 0

[tor-browser-bundle/master] Switch the scramblesuit pluggable transport provider to obfs4proxy.
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit 092dbbf7ee2a1a29a386f50dc1a1bec17a398f6b Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Feb 17 12:42:34 2015 +0000 Switch the scramblesuit pluggable transport provider to obfs4proxy. --- Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 5 +---- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 5 +---- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 50e03fd..d0885ff 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -1,11 +1,8 @@ ## fteproxy configuration ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin --managed -## obfsproxy configuration -ClientTransportPlugin scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfsproxy.bin managed - ## obfs4proxy configuration -ClientTransportPlugin obfs2,obfs3,obfs4 exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy +ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy ## flash proxy configuration # diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 604098f..0dee29b 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -1,11 +1,8 @@ ## fteproxy configuration ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed -## obfsproxy configuration -ClientTransportPlugin scramblesuit exec PluggableTransports/obfsproxy.bin managed - ## obfs4proxy configuration -ClientTransportPlugin obfs2,obfs3,obfs4 exec PluggableTransports/obfs4proxy +ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy ## flash proxy configuration # diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index d92d201..f287e3e 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -1,11 +1,8 @@ ## fteproxy configuration ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --managed -## obfsproxy configuration -ClientTransportPlugin scramblesuit exec TorBrowser\Tor\PluggableTransports\obfsproxy managed - ## obfs4proxy configuration -ClientTransportPlugin obfs2,obfs3,obfs4 exec TorBrowser\Tor\PluggableTransports\obfs4proxy +ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy ## flash proxy configuration #

1 0

[torbutton/master] Bug #5698: Use "Tor Browser" branding in "About Tor Browser" dialog
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit 7fd169e56e60ff70254c2d60600fab88a03246da Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Feb 14 16:58:44 2015 -0800 Bug #5698: Use "Tor Browser" branding in "About Tor Browser" dialog --- src/chrome.manifest | 1 + src/chrome/content/aboutDialog.xul | 56 ++++++++++++++++++++++++++++++++++ src/chrome/locale/en/aboutDialog.dtd | 19 ++++++++++++ src/chrome/skin/about-wordmark.png | Bin 0 -> 4609 bytes src/chrome/skin/aboutDialog.css | 34 +++++++++++++++++++++ src/chrome/skin/default256.png | Bin 0 -> 48898 bytes 6 files changed, 110 insertions(+) diff --git a/src/chrome.manifest b/src/chrome.manifest index 2ab3c8f..6ef50dc 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -8,6 +8,7 @@ resource torbutton ./ # browser branding override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties +overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul locale torbutton af chrome/locale/af/ locale torbutton ak chrome/locale/ak/ diff --git a/src/chrome/content/aboutDialog.xul b/src/chrome/content/aboutDialog.xul new file mode 100644 index 0000000..5b89a81 --- /dev/null +++ b/src/chrome/content/aboutDialog.xul @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?>  +<?xml-stylesheet href="chrome://torbutton/skin/aboutDialog.css" type="text/css"?> + +<!DOCTYPE window [ +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > +%brandDTD; +<!ENTITY % aboutDialogDTD SYSTEM "chrome://torbutton/locale/aboutDialog.dtd" > +%aboutDialogDTD; +]> + +<overlay id="main-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + <vbox id="rightBox"> + <vbox id="detailsBox"> + <description class="text-blurb" id="projectDesc"> + &project.start; + <label class="text-link" + href="https://www.torproject.org/"> + &project.tpoLink; + </label>&project.end; + </description> + <description class="text-blurb" id="helpDesc"> + &help.start; + <label class="text-link" + href="https://www.torproject.org/donate/donate.html.en"> + &help.donateLink; + </label> + &help.or; + <label class="text-link" + href="https://www.torproject.org/getinvolved/volunteer.html.en"> + &help.getInvolvedLink; + </label>&help.end; + </description> + </vbox> + </vbox> + + <vbox id="bottomBox"> + <hbox id="newBottom" pack="center" position="1"> + <label class="text-link bottom-link" + href="https://www.torproject.org/docs/faq.html.en"> + &bottomLinks.questions; + </label> + <label class="text-link bottom-link" + href="https://www.torproject.org/getinvolved/relays"> + &bottomLinks.grow; + </label> + <label class="text-link bottom-link" + href="about:license"> + &bottomLinks.license; + </label> + </hbox> + <description id="trademarkTor" insertafter="trademark"> + &tor.TrademarkStatement; + </description> + </vbox> +</overlay> diff --git a/src/chrome/locale/en/aboutDialog.dtd b/src/chrome/locale/en/aboutDialog.dtd new file mode 100644 index 0000000..844f4e0 --- /dev/null +++ b/src/chrome/locale/en/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; is developed by "> + +<!ENTITY project.tpoLink "the &vendorShortName;"> +<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> + +<!ENTITY help.start "Want to help? "> + +<!ENTITY help.donateLink "Donate"> +<!ENTITY help.or " or "> + +<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Questions?"> + +<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> + +<!ENTITY bottomLinks.license "Licensing Information"> +<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> diff --git a/src/chrome/skin/about-wordmark.png b/src/chrome/skin/about-wordmark.png new file mode 100644 index 0000000..1becd87 Binary files /dev/null and b/src/chrome/skin/about-wordmark.png differ diff --git a/src/chrome/skin/aboutDialog.css b/src/chrome/skin/aboutDialog.css new file mode 100644 index 0000000..89eff53 --- /dev/null +++ b/src/chrome/skin/aboutDialog.css @@ -0,0 +1,34 @@ +#leftBox { + background-image: url('chrome://torbutton/skin/default256.png'); + background-position: right top; + background-size: 180px; +} + +#rightBox { + background-image: url('chrome://torbutton/skin/about-wordmark.png'); + background-position: left top; +} + +#contributeDesc { + display: none; +} + +#communityDesc { + display: none; +} + +#trademark { + display: none; +} + +#trademarkTor { + font-size: xx-small; + text-align: center; + color: #999999; + margin-top: 10px; + margin-bottom: 10px; +} + +#bottomBox > hbox:not(#newBottom) { + display: none; +} diff --git a/src/chrome/skin/default256.png b/src/chrome/skin/default256.png new file mode 100644 index 0000000..3d440fb Binary files /dev/null and b/src/chrome/skin/default256.png differ

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Bug #4234: Use the Firefox Update Process for TBB.
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit 25646ee4fcc9e6b910a1441616d744089a57dac5 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 18 11:22:33 2015 +0000 fixup! Bug #4234: Use the Firefox Update Process for TBB. Small indentation fix. --- browser/base/content/aboutDialog.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index ba856d1..0a6ab8b 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -55,7 +55,8 @@ function init(aEvent) let versionElem = document.getElementById("version"); if (versionElem) versionElem.textContent = TOR_BROWSER_VERSION + - " (based on Mozilla Firefox " + versionElem.textContent + ")"; + " (based on Mozilla Firefox " + + versionElem.textContent + ")"; #endif #ifdef MOZ_UPDATER

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Bug #4234: Use the Firefox Update Process for TBB.
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit 552bdedc60ddac8a7dba54363442bbfc282a94b5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Feb 16 14:50:51 2015 -0800 fixup! Bug #4234: Use the Firefox Update Process for TBB. Cosmetic improvement for #5698 --- browser/base/content/aboutDialog.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index 652cbc1..ba856d1 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -54,7 +54,8 @@ function init(aEvent) #ifdef TOR_BROWSER_VERSION let versionElem = document.getElementById("version"); if (versionElem) - versionElem.textContent += " (Tor Browser " + TOR_BROWSER_VERSION + ")"; + versionElem.textContent = TOR_BROWSER_VERSION + + " (based on Mozilla Firefox " + versionElem.textContent + ")"; #endif #ifdef MOZ_UPDATER

1 0

[tor-browser-bundle/maint-4.0] Disable software update windows in the meek HTTP helper.
by mikeperry＠torproject.org 18 Feb '15

18 Feb '15

commit cc24386ef907afe8414d147cef906d0d13f4aa10 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 14 09:23:34 2015 +0000 Disable software update windows in the meek HTTP helper. https://trac.torproject.org/projects/tor/ticket/14203 --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index 72bbb9b..23565d9 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -14,6 +14,10 @@ user_pref("security.ssl.disable_session_identifiers", false); // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1); +// Don't raise software update windows in this browser instance. +// https://trac.torproject.org/projects/tor/ticket/14203 +user_pref("app.update.enabled", false); + // Set a failsafe blackhole proxy of 127.0.0.1:9, to prevent network interaction // in case the user manages to open this profile with a normal browser UI (i.e., // not headless with the meek-http-helper extension running). Port 9 is

1 0

[tor-browser-bundle/master] Disable software update windows in the meek HTTP helper.
by mikeperry＠torproject.org 18 Feb '15

18 Feb '15

commit 0119a3c15711a66c76496d6e8e55511782140ec1 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 14 09:23:34 2015 +0000 Disable software update windows in the meek HTTP helper. https://trac.torproject.org/projects/tor/ticket/14203 --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index 72bbb9b..23565d9 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -14,6 +14,10 @@ user_pref("security.ssl.disable_session_identifiers", false); // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1); +// Don't raise software update windows in this browser instance. +// https://trac.torproject.org/projects/tor/ticket/14203 +user_pref("app.update.enabled", false); + // Set a failsafe blackhole proxy of 127.0.0.1:9, to prevent network interaction // in case the user manages to open this profile with a normal browser UI (i.e., // not headless with the meek-http-helper extension running). Port 9 is

1 0

[tor-browser-bundle/maint-4.0] Bug 14851: Set NoScript pref to avoid disk leaks of script permissions.
by mikeperry＠torproject.org 17 Feb '15

17 Feb '15

commit 2cca93a5b6d94c92590c3d1139f9a474f214e1ba Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 17 15:42:50 2015 -0800 Bug 14851: Set NoScript pref to avoid disk leaks of script permissions. The NoScript default was changed, we need to change it back. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) 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 39fa6a9..d1469a8 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 @@ -60,3 +60,4 @@ pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); +pref("noscript.volatilePrivatePermissions", 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 39fa6a9..d1469a8 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 @@ -60,3 +60,4 @@ pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); +pref("noscript.volatilePrivatePermissions", 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 f5a3f3c..fb2141b 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 @@ -60,3 +60,4 @@ pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); +pref("noscript.volatilePrivatePermissions", true);

1 0

[tor-browser-bundle/master] Bug 14851: Set NoScript pref to avoid disk leaks of script permissions.
by mikeperry＠torproject.org 17 Feb '15

17 Feb '15

commit 3c987b163b88892ea84380e4701b18dcaeb9c92d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 17 15:42:50 2015 -0800 Bug 14851: Set NoScript pref to avoid disk leaks of script permissions. The NoScript default was changed, we need to change it back. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) 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 39fa6a9..d1469a8 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 @@ -60,3 +60,4 @@ pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); +pref("noscript.volatilePrivatePermissions", 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 39fa6a9..d1469a8 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 @@ -60,3 +60,4 @@ pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); +pref("noscript.volatilePrivatePermissions", 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 f5a3f3c..fb2141b 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 @@ -60,3 +60,4 @@ pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); +pref("noscript.volatilePrivatePermissions", true);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits