April 2015 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Remove redundant whitespace in ctcp-time.patch
by sukhbir＠torproject.org 25 Apr '15

25 Apr '15

commit 0cf962f5d21226d95d274a8cd2ea9080c7155f1b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Apr 25 06:29:22 2015 -0400 Remove redundant whitespace in ctcp-time.patch --- projects/instantbird/ctcp-time.patch | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/projects/instantbird/ctcp-time.patch b/projects/instantbird/ctcp-time.patch index 749cd36..20572e0 100644 --- a/projects/instantbird/ctcp-time.patch +++ b/projects/instantbird/ctcp-time.patch @@ -1,5 +1,5 @@ diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm -index 5722479..642fad3 100644 +index 5722479..6b82caa 100644 --- a/chat/protocols/irc/ircCTCP.jsm +++ b/chat/protocols/irc/ircCTCP.jsm @@ -195,7 +195,7 @@ var ctcpBase = { @@ -11,11 +11,3 @@ index 5722479..642fad3 100644 this.LOG("Received TIME request from " + aMessage.origin + ". Sending TIME response: \"" + now + "\"."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -@@ -230,6 +230,7 @@ var ctcpBase = { - this.sendCTCPMessage(aMessage.origin, true, "VERSION", version); - } - else if (aMessage.command == "NOTICE" && aMessage.ctcp.param.length) { -+ - // VERSION #:#:# - // Received VERSION response, display to the user. - let response = _("ctcp.version", aMessage.origin,

1 0

[tor-messenger-build/master] Add patch for replying CTCP time query with UTC (#15161)
by sukhbir＠torproject.org 25 Apr '15

25 Apr '15

commit cc76370a70c5f4ac883e9e47c74094b976dbafae Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Apr 25 06:26:05 2015 -0400 Add patch for replying CTCP time query with UTC (#15161) --- projects/instantbird/config | 1 + projects/instantbird/ctcp-time.patch | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index e4e3816..f0c81a9 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -68,6 +68,7 @@ input_files: - filename: theme-extension-update.patch - filename: installer.patch - filename: cert_override.txt + - filename: ctcp-time.patch - filename: branding/name.patch - filename: branding/default.png - filename: branding/default16.png diff --git a/projects/instantbird/ctcp-time.patch b/projects/instantbird/ctcp-time.patch new file mode 100644 index 0000000..749cd36 --- /dev/null +++ b/projects/instantbird/ctcp-time.patch @@ -0,0 +1,21 @@ +diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm +index 5722479..642fad3 100644 +--- a/chat/protocols/irc/ircCTCP.jsm ++++ b/chat/protocols/irc/ircCTCP.jsm +@@ -195,7 +195,7 @@ var ctcpBase = { + if (aMessage.command == "PRIVMSG") { + // TIME + // Received a TIME request, send a human readable response. +- let now = (new Date()).toString(); ++ let now = (new Date()).toUTCString(); + this.LOG("Received TIME request from " + aMessage.origin + + ". Sending TIME response: \"" + now + "\"."); + this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); +@@ -230,6 +230,7 @@ var ctcpBase = { + this.sendCTCPMessage(aMessage.origin, true, "VERSION", version); + } + else if (aMessage.command == "NOTICE" && aMessage.ctcp.param.length) { ++ + // VERSION #:#:# + // Received VERSION response, display to the user. + let response = _("ctcp.version", aMessage.origin,

1 0

[webwml/master] Remove statement about Mac bundles needing no installation.
by mikeperry＠torproject.org 25 Apr '15

25 Apr '15

commit 1e8c48750462a30d2c7b11e5de2dbee70f97fda9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 24 17:24:45 2015 -0700 Remove statement about Mac bundles needing no installation. --- download/en/download-easy.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 0868a0d..1d47828 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -61,7 +61,7 @@ <div class="desc"> <h2>Tor Browser for Mac</h2> <em>Version <version-torbrowserbundleosx32> - OS X (10.6+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a> - <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more »</a></p> + <p>Everything you need to safely browse the Internet.<br /><a href="<page projects/torbrowser>">Learn more »</a></p> </div> <form class="downloads"> <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx32>-osx32_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>

1 0

[webwml/master] Add screenshots that show how to run Tor Browser on OS X.
by mikeperry＠torproject.org 25 Apr '15

25 Apr '15

commit 3b647388ec91070e307a9e508f2d7ac597c799d8 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Feb 12 12:29:32 2015 -0800 Add screenshots that show how to run Tor Browser on OS X. https://trac.torproject.org/projects/tor/ticket/14838 --- css/layout.css | 14 ++++++++++++++ download/en/download-easy.wml | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/css/layout.css b/css/layout.css index 4e305f7..54d225b 100644 --- a/css/layout.css +++ b/css/layout.css @@ -660,6 +660,20 @@ table tr img { padding-bottom: 8px; } +.howto th, .howto td { + padding: 2px; +} + +.howto th { + font-weight: bold; + text-align: center; +} + +.howto img { + border: 0; + margin: 0; +} + #download-donate { background-attachment: scroll; background-clip: border-box; diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 727a874..0868a0d 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -75,6 +75,24 @@ </form> <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">GNU/Linux</a></p> </div> +  + <table class="howto"> + <tr> + <th>1. Install</th> + <th>2. Control-click</th> + <th>3. Open</th> + </tr> + <tr> + <td><img src="$(IMGROOT)/tbb-macosx-step-1.png" alt="Screenshot showing the contents of the Tor Browser dmg file."></td> + <td><img src="$(IMGROOT)/tbb-macosx-step-2.png" alt="Screenshot of the Applications folder with the Tor Browser icon."></td> + <td><img src="$(IMGROOT)/tbb-macosx-step-3.png" alt="Dialog offering to open Tor Browser."></td> + </tr> + <tr> + <td>Drag the Tor Browser icon to the Applications folder and open the Applications folder.</td> + <td>Control-click on the Tor Browser icon (click the mouse button while pressing the Control key on the keyboard) and choose “Open”.</td> + <td>Click “Open” on the next screen.</td> + </tr> + </table> </div>  <div id="linux" class="easy linux">

1 0

[webwml/master] Add screenshots for MacOS install instructions (#14838).
by mikeperry＠torproject.org 25 Apr '15

25 Apr '15

commit 8c308cd6ef7c95b28cf0fc2c4afa1ebf601cd200 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 24 17:17:17 2015 -0700 Add screenshots for MacOS install instructions (#14838). --- images/tbb-macosx-step-1.png | Bin 0 -> 21334 bytes images/tbb-macosx-step-2.png | Bin 0 -> 20451 bytes images/tbb-macosx-step-3.png | Bin 0 -> 13846 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/tbb-macosx-step-1.png b/images/tbb-macosx-step-1.png new file mode 100644 index 0000000..2dd11fc Binary files /dev/null and b/images/tbb-macosx-step-1.png differ diff --git a/images/tbb-macosx-step-2.png b/images/tbb-macosx-step-2.png new file mode 100644 index 0000000..40f6f92 Binary files /dev/null and b/images/tbb-macosx-step-2.png differ diff --git a/images/tbb-macosx-step-3.png b/images/tbb-macosx-step-3.png new file mode 100644 index 0000000..27e98cf Binary files /dev/null and b/images/tbb-macosx-step-3.png differ

1 0

[tor/master] Mark set-test-permissions as .PHONY; use u+x only
by nickm＠torproject.org 24 Apr '15

24 Apr '15

commit 63a90f2df4dcd7fff862ca3849f3aa3b1dec7e84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 24 16:10:34 2015 -0400 Mark set-test-permissions as .PHONY; use u+x only --- src/test/include.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index c693544..570048d 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -16,8 +16,9 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ check-am: set-test-permissions +.PHONY: set-test-permissions set-test-permissions: - chmod 755 $(TESTSCRIPTS) + chmod u+x $(TESTSCRIPTS) noinst_PROGRAMS+= src/test/bench

1 0

[tor/master] Revert "Add +x to these .in files; see if it helps"
by nickm＠torproject.org 24 Apr '15

24 Apr '15

commit f6167f51ac99305853ded434cccfc3718e6d4d9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 24 16:05:41 2015 -0400 Revert "Add +x to these .in files; see if it helps" This reverts commit ecf98313d673f010b52f8d29c352cd9b8f145734. It didn't help. --- 0 files changed diff --git a/src/test/test_bt.sh.in b/src/test/test_bt.sh.in old mode 100755 new mode 100644 diff --git a/src/test/test_ntor.sh.in b/src/test/test_ntor.sh.in old mode 100755 new mode 100644 diff --git a/src/test/test_zero_length_keys.sh.in b/src/test/test_zero_length_keys.sh.in old mode 100755 new mode 100644

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug 12827: Create preference to disable SVG.
by mikeperry＠torproject.org 24 Apr '15

24 Apr '15

commit 3006aa548cefa2f9d0968c978786dcefa9309119 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Apr 24 10:40:44 2015 -0400 fixup! Bug 12827: Create preference to disable SVG. During parsing, avoid dereferencing null pointers when script and style elements are created as generic elements (i.e., when svg.in-content.enabled=false). Fixes ticket #15794. --- parser/html/nsHtml5TreeOperation.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/parser/html/nsHtml5TreeOperation.cpp b/parser/html/nsHtml5TreeOperation.cpp index 7ad65247..b9f1768 100644 --- a/parser/html/nsHtml5TreeOperation.cpp +++ b/parser/html/nsHtml5TreeOperation.cpp @@ -607,8 +607,8 @@ void nsHtml5TreeOperation::PreventScriptExecution(nsIContent* aNode) { nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aNode); - MOZ_ASSERT(sele); - sele->PreventExecution(); + if (sele) + sele->PreventExecution(); } void @@ -827,14 +827,18 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder, case eTreeOpSetStyleLineNumber: { nsIContent* node = *(mOne.node); nsCOMPtr<nsIStyleSheetLinkingElement> ssle = do_QueryInterface(node); - NS_ASSERTION(ssle, "Node didn't QI to style."); + if (!ssle) + return NS_ERROR_DOM_NOT_SUPPORTED_ERR; + ssle->SetLineNumber(mFour.integer); return NS_OK; } case eTreeOpSetScriptLineNumberAndFreeze: { nsIContent* node = *(mOne.node); nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(node); - NS_ASSERTION(sele, "Node didn't QI to script."); + if (!sele) + return NS_ERROR_DOM_NOT_SUPPORTED_ERR; + sele->SetScriptLineNumber(mFour.integer); sele->FreezeUriAsyncDefer(); return NS_OK;

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 24 Apr '15

24 Apr '15

commit b05f6c1ee77a2764b8f32c7b2dde8008e1783030 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 24 19:15:05 2015 +0000 Update translations for gettor --- es_MX/gettor.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/es_MX/gettor.po b/es_MX/gettor.po index 75fc6f9..a524f74 100644 --- a/es_MX/gettor.po +++ b/es_MX/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2015-04-24 13:03+0000\n" +"PO-Revision-Date: 2015-04-24 18:52+0000\n" "Last-Translator: Ciclovia Stiltskin <blueshoot(a)yahoo.com>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -137,7 +137,7 @@ msgid "" "If your bandwith is low or your provider doesn't allow you to\n" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." -msgstr "Si su banda ancha es baja o si su proveedor no le permite\n recibir archivos adjuntos de gran tamaño en su correo electónico, GetTor puede enviarle paquetes pequeños en vez de uno grande. " +msgstr "Si su banda ancha es de baja velocidad o si su proveedor no le permite\n recibir archivos adjuntos de gran tamaño en su correo electónico, GetTor puede enviarlo en paquetes pequeños en vez de uno grande. " #: lib/gettor/i18n.py:101 msgid "" @@ -152,7 +152,7 @@ msgstr "Simplemente incluya la palabra \"split\" de manera aislada en un nuevo r msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "Mandar este texto por correo electrónico a GetTor producirá que se le envíe el Paquete Tor Browser en una cantidad de adjuntos de 1,4MB" +msgstr "Al mandar este texto por correo electrónico a GetTor producirá que se le envíe Tor Browser Bundle en varios archivos adjuntos de 1,4MB. " #: lib/gettor/i18n.py:110 msgid "" @@ -169,31 +169,31 @@ msgid "" "2.) Unzip all files ending in \".z\". If you saved all attachments to\n" "a fresh folder before, simply unzip all files in that folder. If you don't\n" "know how to unzip the .z files, please see the UNPACKING THE FILES section." -msgstr "" +msgstr "2.) Descomprima los archivos que terminen en\".z\". Si usted ha guardado los archivos adjuntos en\n una carpeta nueva, simplemente descomprima todos los archivos en dicha carpeta. Si usted \nno\nsabe como descomprimir los archivos .z, por favor refierase a la sección DESCOMPRESIÓN DE ARCHIVOS " #: lib/gettor/i18n.py:119 msgid "" "3.) Verify all files as described in the mail you received with \n" "each package. (gpg --verify)" -msgstr "" +msgstr "3.) Verifique todos los archivos como ha sido descrito en el correo que recibió con\ncada paquete. (gpg --verify) " #: lib/gettor/i18n.py:122 msgid "" "4.) Now unpack the multi-volume archive into one file by double-\n" "clicking the file ending in \"..split.part01.exe\". This should start the \n" "process automatically." -msgstr "" +msgstr "4.) Ahora descargue el archivo multi-volume en un solo fichero haciendo doble\nclick en el archivo con terminación \"..split.part01.exe\". Esto debe iniciar el\nproceso automaticamente." #: lib/gettor/i18n.py:126 msgid "" "5.) After unpacking is finished, you should find a newly created \n" "\".exe\" file in your destination folder. Simply doubleclick\n" "that and Tor Browser Bundle should start within a few seconds." -msgstr "" +msgstr "5.) Después de que la descarga ha finalizado, usted debería encontrar un nuevo archivo\n\".exe\" en su carpeta de destino. Simplemente realice doble click en el\ny Tor Browser Bundle debe iniciar en unos segundos." #: lib/gettor/i18n.py:130 msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" -msgstr "" +msgstr "6.) Listo. Usted ha concluido. Gracias por usar Tor y ¡diviértase!" #: lib/gettor/i18n.py:132 msgid ""

1 0

[tor-browser-bundle/master] Update changelog and versions
by gk＠torproject.org 24 Apr '15

24 Apr '15

commit 3e6e3159c90cdfe33c38ed698d702ec97fcf49cc Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 24 18:26:16 2015 +0000 Update changelog and versions --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++-- gitian/versions | 6 +++--- gitian/versions.alpha | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ee17952..ce63883 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 4.5 -- Apr 28 2015 * Update Tor to 0.2.6.7 with additional patches: * Bug 15482: Reset timestamp_dirty each time a SOCKSAuth circuit is used * Update NoScript to 2.6.9.22 - * Update HTTPS-Everywhere to 5.0.2 + * Update HTTPS-Everywhere to 5.0.3 * Bug 15689: Resume building HTTPS-Everywhere from git tags * Update meek to 0.17 * Update obfs4proxy to 0.0.5 @@ -12,18 +12,20 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked * Bug 13576: Don't strip "bridge" from the middle of bridge lines * Bug 15657: Display the host:port of any connection faiures in bootstrap - * Update Torbutton to 1.9.2.1 + * Update Torbutton to 1.9.2.2 * Bug 15562: Bind SharedWorkers to thirdparty pref * Bug 15533: Restore default security level when restoring defaults * Bug 15510: Close Tor Circuit UI control port connections on New Identity * Bug 15472: Make node text black in circuit status UI * Bug 15502: Wipe blob URIs on New Identity + * Bug 15795: Some security slider prefs do not trigger custom checkbox * Bug 14429: Disable automatic window resizing for now * Bug 4100: Raise HTTP Keep-Alive back to 115 second default * Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism * Bugs 14716+13254: Fix issues with HTTP Auth usage and TLS connection info display * Bug 15502: Isolate blob URI scope to URL domain; block WebWorker access + * Bug 15794: Crash on some pages with SVG images if SVG is disabled * Bug 15562: Disable Javascript SharedWorkers due to third party tracking * Bug 15757: Disable Mozilla video statistics API extensions * Bug 15758: Disable Device Sensor APIs diff --git a/gitian/versions b/gitian/versions index d490333..26b116b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,11 +8,11 @@ FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3 TOR_TAG=tor-0.2.6.7 TORLAUNCHER_TAG=0.2.7.4 -TORBUTTON_TAG=1.9.2.1 -HTTPSE_TAG=5.0.2 +TORBUTTON_TAG=1.9.2.2 +HTTPSE_TAG=5.0.3 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 7f323be..86e163d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,11 +8,11 @@ FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3 TOR_TAG=tor-0.2.6.7 TORLAUNCHER_TAG=0.2.7.4 -TORBUTTON_TAG=1.9.2.1 -HTTPSE_TAG=5.0.2 +TORBUTTON_TAG=1.9.2.2 +HTTPSE_TAG=5.0.3 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0