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

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 21 May '16

21 May '16

commit 4190f85afe657987e291f278dbf5bb8fa4d56145 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 04:16:50 2016 +0000 Update translations for tails-onioncircuits --- fa/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/onioncircuits.pot b/fa/onioncircuits.pot index df9dfa5..02c4c44 100644 --- a/fa/onioncircuits.pot +++ b/fa/onioncircuits.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-31 21:31+0200\n" -"PO-Revision-Date: 2016-05-15 07:46+0000\n" +"PO-Revision-Date: 2016-05-21 03:48+0000\n" "Last-Translator: Sina Eghbal <s.eghbal(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-messenger-fingerdtd_completed] Update translations for tor-messenger-fingerdtd_completed
by translation＠torproject.org 21 May '16

21 May '16

commit eb87d2a34c69245bac960ef25cf4988cd6612971 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 04:16:27 2016 +0000 Update translations for tor-messenger-fingerdtd_completed --- fa/finger.dtd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fa/finger.dtd b/fa/finger.dtd index ee8aa3d..9bd8690 100644 --- a/fa/finger.dtd +++ b/fa/finger.dtd @@ -7,4 +7,9 @@ <!ENTITY finger.protocol "پروتکل"> <!ENTITY finger.verify "تایید"> <!ENTITY finger.remove "حذف"> -<!ENTITY finger.intro "لیست اثرانگشت‌هایی که تاکنون دیده‌اید را مدیریت کنید."> \ No newline at end of file +<!ENTITY finger.intro "لیست اثرانگشت‌هایی که تاکنون دیده‌اید را مدیریت کنید."> +<!ENTITY addFingerDialog.title "اضافه کردن اثر انگشت"> +<!ENTITY addFingerDialog.finger "اثر انگشت"> +<!ENTITY addFingerDialog.accept "خٌب"> +<!ENTITY addFingerDialog.cancel "از قلم بینداز"> +<!ENTITY addFingerDialog.tooltip "اگر از اثرانگشت ۴۰ رقمی مبنای ۱۶ کلید خصوصی OTR تماس خود آگاه هستید، آنرا وارد کنید."> \ No newline at end of file

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 21 May '16

21 May '16

commit 2c5f3f04487221a70e5f8090773269d371d7d9c0 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 04:16:23 2016 +0000 Update translations for tor-messenger-fingerdtd --- fa/finger.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fa/finger.dtd b/fa/finger.dtd index 2b71cb5..9bd8690 100644 --- a/fa/finger.dtd +++ b/fa/finger.dtd @@ -8,8 +8,8 @@ <!ENTITY finger.verify "تایید"> <!ENTITY finger.remove "حذف"> <!ENTITY finger.intro "لیست اثرانگشت‌هایی که تاکنون دیده‌اید را مدیریت کنید."> -<!ENTITY addFingerDialog.title "Add Fingerprint"> -<!ENTITY addFingerDialog.finger "Fingerprint"> -<!ENTITY addFingerDialog.accept "OK"> -<!ENTITY addFingerDialog.cancel "Skip"> -<!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file +<!ENTITY addFingerDialog.title "اضافه کردن اثر انگشت"> +<!ENTITY addFingerDialog.finger "اثر انگشت"> +<!ENTITY addFingerDialog.accept "خٌب"> +<!ENTITY addFingerDialog.cancel "از قلم بینداز"> +<!ENTITY addFingerDialog.tooltip "اگر از اثرانگشت ۴۰ رقمی مبنای ۱۶ کلید خصوصی OTR تماس خود آگاه هستید، آنرا وارد کنید."> \ No newline at end of file

1 0

[meek/bug18371] Bug 18904: Mac OS meek-http-helper profile not updated
by dcf＠torproject.org 20 May '16

20 May '16

commit cca1ed4a2b7401abe2fb42e22f8f22a3bfe091fd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu May 12 11:31:40 2016 -0400 Bug 18904: Mac OS meek-http-helper profile not updated To ensure that the meek-http-helper profile is up-to-date with respect to the template (e.g., after Tor Browser has been updated), the contents of the file meek-template-sha256sum.txt within the profile are compared with the corresponding template file; if they differ, the profile is deleted and recreated. --- meek-client-torbrowser/mac.go | 2 +- meek-client-torbrowser/meek-client-torbrowser.go | 50 ++++++++++++++++++++---- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/meek-client-torbrowser/mac.go b/meek-client-torbrowser/mac.go index a2be44c..de946be 100644 --- a/meek-client-torbrowser/mac.go +++ b/meek-client-torbrowser/mac.go @@ -7,7 +7,7 @@ package main const ( // During startup of meek-client-torbrowser, the browser profile is - // created under firefoxProfilePath if it does not exist by making a + // created and maintained under firefoxProfilePath by making a // recursive copy of everything under profileTemplatePath. firefoxPath = "../firefox" firefoxProfilePath = "../../../../TorBrowser-Data/Tor/PluggableTransports/profile.meek-http-helper" diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 8647d5d..a98fcb5 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -22,6 +22,7 @@ package main import ( "bufio" + "bytes" "flag" "fmt" "io" @@ -91,23 +92,42 @@ func copyFile(srcPath string, mode os.FileMode, destPath string) error { return err } -// Make sure that the browser profile exists. If it does not exist and if -// profileTemplatePath is not empty, create it by making a recursive copy of +// Make sure that the browser profile exists. If profileTemplatePath is not +// empty, the profile is created and maintained by making a recursive copy of // all the files and directories under profileTemplatePath. A safe copy is // done by first copying the profile files into a temporary directory and // then doing an atomic rename of the temporary directory as the last step. -func ensureProfileExists(profilePath string) error { +// To ensure that the profile is up-to-date with respect to the template +// (e.g., after Tor Browser has been updated), the contents of the file +// meek-template-sha256sum.txt within the profile are compared with the +// corresponding template file; if they differ, the profile is deleted and +// recreated. +func prepareBrowserProfile(profilePath string) error { _, err := os.Stat(profilePath) - if err == nil || os.IsExist(err) { - return nil // The profile has already been created. - } + profileExists := err == nil || os.IsExist(err) // If profileTemplatePath is not set, we are running on a platform that // expects the profile to already exist. if profileTemplatePath == "" { + if profileExists { + return nil + } return err } + if profileExists { + if isBrowserProfileUpToDate(profileTemplatePath, profilePath) { + return nil + } + + // Remove outdated meek helper profile. + log.Printf("removing outdated profile at %s\n", profilePath) + err = os.RemoveAll(profilePath) + if err != nil { + return err + } + } + log.Printf("creating profile by copying files from %s to %s\n", profileTemplatePath, profilePath) profileParentPath := filepath.Dir(profilePath) err = os.MkdirAll(profileParentPath, os.ModePerm) @@ -160,6 +180,22 @@ func ensureProfileExists(profilePath string) error { return os.Rename(tmpPath, profilePath) } +// Return true if the profile is up-to-date with the template. +func isBrowserProfileUpToDate(templatePath string, profilePath string) bool { + checksumFileName := "meek-template-sha256sum.txt" + templateChecksumPath := filepath.Join(templatePath, checksumFileName) + templateData, err := ioutil.ReadFile(templateChecksumPath) + if (err != nil) { + return false + } + profileChecksumPath := filepath.Join(profilePath, checksumFileName) + profileData, err := ioutil.ReadFile(profileChecksumPath) + if (err != nil) { + return false + } + + return bytes.Equal(templateData, profileData) +} // Run firefox and return its exec.Cmd and stdout pipe. func runFirefox() (cmd *exec.Cmd, stdout io.Reader, err error) { @@ -174,7 +210,7 @@ func runFirefox() (cmd *exec.Cmd, stdout io.Reader, err error) { if err != nil { return } - err = ensureProfileExists(profilePath) + err = prepareBrowserProfile(profilePath) if err != nil { return }

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] Bug 19121: reinstate the update.xml hash check
by gk＠torproject.org 20 May '16

20 May '16

commit c179270e049f085ec8ae1ad443dd1b1fe1084728 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri May 20 11:08:51 2016 -0400 Bug 19121: reinstate the update.xml hash check This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert most changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." We kept the addition to the AppConstants API in case other JS code references it in the future. --- toolkit/mozapps/update/nsUpdateService.js | 7 ------- .../chrome/test_0061_check_verifyFailPartial_noComplete.xul | 4 ++-- .../chrome/test_0062_check_verifyFailComplete_noPartial.xul | 4 ++-- .../tests/chrome/test_0063_check_verifyFailPartialComplete.xul | 6 +++--- .../test_0064_check_verifyFailPartial_successComplete.xul | 4 ++-- .../chrome/test_0071_notify_verifyFailPartial_noComplete.xul | 4 ++-- .../chrome/test_0072_notify_verifyFailComplete_noPartial.xul | 4 ++-- .../chrome/test_0073_notify_verifyFailPartialComplete.xul | 6 +++--- .../test_0074_notify_verifyFailPartial_successComplete.xul | 4 ++-- .../chrome/test_0084_error_patchApplyFailure_verify_failed.xul | 2 +- toolkit/mozapps/update/tests/chrome/update.sjs | 10 +++++----- .../update/tests/unit_aus_update/downloadAndHashCheckMar.js | 8 +------- 12 files changed, 25 insertions(+), 38 deletions(-) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index e12636d..4495210 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -3714,13 +3714,6 @@ Downloader.prototype = { } LOG("Downloader:_verifyDownload downloaded size == expected size."); - - // The hash check is not necessary when mar signatures are used to verify - // the downloaded mar file. - if (AppConstants.MOZ_VERIFY_MAR_SIGNATURE) { - return true; - } - let fileStream = Cc["@mozilla.org/network/file-input-stream;1"]. createInstance(Ci.nsIFileInputStream); fileStream.init(destination, FileUtils.MODE_RDONLY, FileUtils.PERMS_FILE, 0); diff --git a/toolkit/mozapps/update/tests/chrome/test_0061_check_verifyFailPartial_noComplete.xul b/toolkit/mozapps/update/tests/chrome/test_0061_check_verifyFailPartial_noComplete.xul index ba2347c..fe877ee 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0061_check_verifyFailPartial_noComplete.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0061_check_verifyFailPartial_noComplete.xul @@ -8,7 +8,7 @@ <?xml-stylesheet href="chrome://global/skin" type="text/css"?> <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?> -<window title="Update Wizard pages: update check, basic, download, and errors (partial patch with an invalid size)" +<window title="Update Wizard pages: update check, basic, download, and errors (partial patch with an invalid hash)" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="runTestDefault();"> <script type="application/javascript" @@ -35,7 +35,7 @@ function runTest() { debugDump("entering"); let url = URL_HTTP_UPDATE_XML + "?showDetails=1&partialPatchOnly=1" + - "&invalidPartialSize=1" + getVersionParams(); + "&invalidPartialHash=1" + getVersionParams(); setUpdateURLOverride(url); gUP.checkForUpdates(); diff --git a/toolkit/mozapps/update/tests/chrome/test_0062_check_verifyFailComplete_noPartial.xul b/toolkit/mozapps/update/tests/chrome/test_0062_check_verifyFailComplete_noPartial.xul index 731a258..39c63c6 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0062_check_verifyFailComplete_noPartial.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0062_check_verifyFailComplete_noPartial.xul @@ -8,7 +8,7 @@ <?xml-stylesheet href="chrome://global/skin" type="text/css"?> <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?> -<window title="Update Wizard pages: update check, basic, download, and errors (complete patch with an invalid size)" +<window title="Update Wizard pages: update check, basic, download, and errors (complete patch with an invalid hash)" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="runTestDefault();"> <script type="application/javascript" @@ -35,7 +35,7 @@ function runTest() { debugDump("entering"); let url = URL_HTTP_UPDATE_XML + "?showDetails=1&completePatchOnly=1" + - "&invalidCompleteSize=1" + getVersionParams(); + "&invalidCompleteHash=1" + getVersionParams(); setUpdateURLOverride(url); gUP.checkForUpdates(); diff --git a/toolkit/mozapps/update/tests/chrome/test_0063_check_verifyFailPartialComplete.xul b/toolkit/mozapps/update/tests/chrome/test_0063_check_verifyFailPartialComplete.xul index 65071bc..16ec709 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0063_check_verifyFailPartialComplete.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0063_check_verifyFailPartialComplete.xul @@ -8,7 +8,7 @@ <?xml-stylesheet href="chrome://global/skin" type="text/css"?> <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?> -<window title="Update Wizard pages: update check, basic, download, and errors (partial and complete patches with invalid sizes)" +<window title="Update Wizard pages: update check, basic, download, and errors (partial and complete patches with invalid hashes)" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="runTestDefault();"> <script type="application/javascript" @@ -34,8 +34,8 @@ const TESTS = [ { function runTest() { debugDump("entering"); - let url = URL_HTTP_UPDATE_XML + "?showDetails=1&invalidPartialSize=1" + - "&invalidCompleteSize=1" + getVersionParams(); + let url = URL_HTTP_UPDATE_XML + "?showDetails=1&invalidPartialHash=1" + + "&invalidCompleteHash=1" + getVersionParams(); setUpdateURLOverride(url); gUP.checkForUpdates(); diff --git a/toolkit/mozapps/update/tests/chrome/test_0064_check_verifyFailPartial_successComplete.xul b/toolkit/mozapps/update/tests/chrome/test_0064_check_verifyFailPartial_successComplete.xul index 6bb0eb8..73b9351 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0064_check_verifyFailPartial_successComplete.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0064_check_verifyFailPartial_successComplete.xul @@ -8,7 +8,7 @@ <?xml-stylesheet href="chrome://global/skin" type="text/css"?> <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?> -<window title="Update Wizard pages: update check, basic, download, and finished (partial patch with an invalid size and successful complete patch)" +<window title="Update Wizard pages: update check, basic, download, and finished (partial patch with an invalid hash and successful complete patch)" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="runTestDefault();"> <script type="application/javascript" @@ -34,7 +34,7 @@ const TESTS = [ { function runTest() { debugDump("entering"); - let url = URL_HTTP_UPDATE_XML + "?showDetails=1&invalidPartialSize=1" + + let url = URL_HTTP_UPDATE_XML + "?showDetails=1&invalidPartialHash=1" + getVersionParams(); setUpdateURLOverride(url); diff --git a/toolkit/mozapps/update/tests/chrome/test_0071_notify_verifyFailPartial_noComplete.xul b/toolkit/mozapps/update/tests/chrome/test_0071_notify_verifyFailPartial_noComplete.xul index 8c09a67..ce087a9 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0071_notify_verifyFailPartial_noComplete.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0071_notify_verifyFailPartial_noComplete.xul @@ -8,7 +8,7 @@ <?xml-stylesheet href="chrome://global/skin" type="text/css"?> <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?> -<window title="Update Wizard pages: errors (partial patch with an invalid size)" +<window title="Update Wizard pages: errors (partial patch with an invalid hash)" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="runTestDefault();"> <script type="application/javascript" @@ -27,7 +27,7 @@ const TESTS = [ { function runTest() { debugDump("entering"); - let patches = getLocalPatchString("partial", null, null, null, "1234", null, + let patches = getLocalPatchString("partial", null, null, "1234", null, null, STATE_DOWNLOADING); let updates = getLocalUpdateString(patches, null, null, null, Services.appinfo.version, diff --git a/toolkit/mozapps/update/tests/chrome/test_0072_notify_verifyFailComplete_noPartial.xul b/toolkit/mozapps/update/tests/chrome/test_0072_notify_verifyFailComplete_noPartial.xul index 67f4556..01f4a2c 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0072_notify_verifyFailComplete_noPartial.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0072_notify_verifyFailComplete_noPartial.xul @@ -8,7 +8,7 @@ <?xml-stylesheet href="chrome://global/skin" type="text/css"?> <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?> -<window title="Update Wizard pages: errors (complete patch with an invalid size)" +<window title="Update Wizard pages: errors (complete patch with an invalid hash)" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="runTestDefault();"> <script type="application/javascript" @@ -27,7 +27,7 @@ const TESTS = [ { function runTest() { debugDump("entering"); - let patches = getLocalPatchString("complete", null, null, null, "1234", null, + let patches = getLocalPatchString("complete", null, null, "1234", null, null, STATE_DOWNLOADING); let updates = getLocalUpdateString(patches, null, null, null, Services.appinfo.version, diff --git a/toolkit/mozapps/update/tests/chrome/test_0073_notify_verifyFailPartialComplete.xul b/toolkit/mozapps/update/tests/chrome/test_0073_notify_verifyFailPartialComplete.xul index 8e9814e..ffa8048 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0073_notify_verifyFailPartialComplete.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0073_notify_verifyFailPartialComplete.xul @@ -8,7 +8,7 @@ <?xml-stylesheet href="chrome://global/skin" type="text/css"?> <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?> -<window title="Update Wizard pages: errors (partial and complete patches with invalid sizes)" +<window title="Update Wizard pages: errors (partial and complete patches with invalid hashes)" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="runTestDefault();"> <script type="application/javascript" @@ -27,9 +27,9 @@ const TESTS = [ { function runTest() { debugDump("entering"); - let patches = getLocalPatchString("partial", null, null, null, "1234", null, + let patches = getLocalPatchString("partial", null, null, "1234", null, null, STATE_DOWNLOADING) + - getLocalPatchString("complete", null, null, null, "1234", + getLocalPatchString("complete", null, null, "1234", null, "false"); let updates = getLocalUpdateString(patches, null, null, null, Services.appinfo.version, diff --git a/toolkit/mozapps/update/tests/chrome/test_0074_notify_verifyFailPartial_successComplete.xul b/toolkit/mozapps/update/tests/chrome/test_0074_notify_verifyFailPartial_successComplete.xul index 1f5799e..708c6bf 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0074_notify_verifyFailPartial_successComplete.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0074_notify_verifyFailPartial_successComplete.xul @@ -8,7 +8,7 @@ <?xml-stylesheet href="chrome://global/skin" type="text/css"?> <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?> -<window title="Update Wizard pages: finishedBackground (partial patch with an invalid size and successful complete patch)" +<window title="Update Wizard pages: finishedBackground (partial patch with an invalid hash and successful complete patch)" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="runTestDefault();"> <script type="application/javascript" @@ -27,7 +27,7 @@ const TESTS = [ { function runTest() { debugDump("entering"); - let patches = getLocalPatchString("partial", null, null, null, "1234", null, + let patches = getLocalPatchString("partial", null, null, "1234", null, null, STATE_DOWNLOADING) + getLocalPatchString("complete", null, null, null, null, "false"); diff --git a/toolkit/mozapps/update/tests/chrome/test_0084_error_patchApplyFailure_verify_failed.xul b/toolkit/mozapps/update/tests/chrome/test_0084_error_patchApplyFailure_verify_failed.xul index 6b742ad..8861e24 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0084_error_patchApplyFailure_verify_failed.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0084_error_patchApplyFailure_verify_failed.xul @@ -42,7 +42,7 @@ function runTest() { let patches = getLocalPatchString("partial", null, null, null, null, null, STATE_PENDING) + getLocalPatchString("complete", slowDownloadURL, "MD5", - null, "1234", + "1234cd43a1c77e30191c53a329a3f99d", null, "false"); let updates = getLocalUpdateString(patches, null, null, null, Services.appinfo.version, diff --git a/toolkit/mozapps/update/tests/chrome/update.sjs b/toolkit/mozapps/update/tests/chrome/update.sjs index e054384..0f1e6ac 100644 --- a/toolkit/mozapps/update/tests/chrome/update.sjs +++ b/toolkit/mozapps/update/tests/chrome/update.sjs @@ -112,18 +112,18 @@ function handleRequest(aRequest, aResponse) { return; } - let size; + let hash; let patches = ""; if (!params.partialPatchOnly) { - size = SIZE_SIMPLE_MAR + (params.invalidCompleteSize ? "1" : ""); + hash = SHA512_HASH_SIMPLE_MAR + (params.invalidCompleteHash ? "e" : ""); patches += getRemotePatchString("complete", SERVICE_URL, "SHA512", - SHA512_HASH_SIMPLE_MAR, size); + hash, SIZE_SIMPLE_MAR); } if (!params.completePatchOnly) { - size = SIZE_SIMPLE_MAR + (params.invalidPartialSize ? "1" : ""); + hash = SHA512_HASH_SIMPLE_MAR + (params.invalidPartialHash ? "e" : ""); patches += getRemotePatchString("partial", SERVICE_URL, "SHA512", - SHA512_HASH_SIMPLE_MAR, size); + hash, SIZE_SIMPLE_MAR); } let type = params.type ? params.type : "major"; diff --git a/toolkit/mozapps/update/tests/unit_aus_update/downloadAndHashCheckMar.js b/toolkit/mozapps/update/tests/unit_aus_update/downloadAndHashCheckMar.js index 8727e37..c6b2f81 100644 --- a/toolkit/mozapps/update/tests/unit_aus_update/downloadAndHashCheckMar.js +++ b/toolkit/mozapps/update/tests/unit_aus_update/downloadAndHashCheckMar.js @@ -23,13 +23,7 @@ function run_test() { // The mock XMLHttpRequest is MUCH faster overrideXHR(callHandleEvent); standardInit(); - // Only perform the non hash check tests when mar signing is enabled since the - // update service doesn't perform hash checks when mar signing is enabled. - if (IS_MAR_CHECKS_ENABLED) { - do_execute_soon(run_test_pt11); - } else { - do_execute_soon(run_test_pt1); - } + do_execute_soon(run_test_pt1); } // The HttpServer must be stopped before calling do_test_finished

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 20 May '16

20 May '16

commit c753cfa1e5f151c6e1e662994fbd4d449907a1ef Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 20 19:16:53 2016 +0000 Update translations for tails-onioncircuits_completed --- zh_CN/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/onioncircuits.pot b/zh_CN/onioncircuits.pot index c164634..38c7c52 100644 --- a/zh_CN/onioncircuits.pot +++ b/zh_CN/onioncircuits.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-31 23:50+0000\n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-05-20 19:14+0000\n" "Last-Translator: Xiaolan <xiaolan(a)protonmail.ch>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 20 May '16

20 May '16

commit 45c6500780e76503805566475211cdef801f2059 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 20 19:16:50 2016 +0000 Update translations for tails-onioncircuits --- zh_CN/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/onioncircuits.pot b/zh_CN/onioncircuits.pot index c164634..38c7c52 100644 --- a/zh_CN/onioncircuits.pot +++ b/zh_CN/onioncircuits.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-31 23:50+0000\n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-05-20 19:14+0000\n" "Last-Translator: Xiaolan <xiaolan(a)protonmail.ch>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-messenger-fingerdtd_completed] Update translations for tor-messenger-fingerdtd_completed
by translation＠torproject.org 20 May '16

20 May '16

commit 6dcce5183712722c1cefc585cb6a343e0777c582 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 20 19:16:26 2016 +0000 Update translations for tor-messenger-fingerdtd_completed --- zh_CN/finger.dtd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zh_CN/finger.dtd b/zh_CN/finger.dtd index f81ef21..216377e 100644 --- a/zh_CN/finger.dtd +++ b/zh_CN/finger.dtd @@ -7,4 +7,9 @@ <!ENTITY finger.protocol "协议"> <!ENTITY finger.verify "验证"> <!ENTITY finger.remove "移除"> -<!ENTITY finger.intro "管理已知指纹列表。"> \ No newline at end of file +<!ENTITY finger.intro "管理已知指纹列表。"> +<!ENTITY addFingerDialog.title "添加指纹"> +<!ENTITY addFingerDialog.finger "指纹"> +<!ENTITY addFingerDialog.accept "确定"> +<!ENTITY addFingerDialog.cancel "跳过"> +<!ENTITY addFingerDialog.tooltip "如果您知道您的联系人的 OTR 私钥的40位16进制指纹，现在请输入它。"> \ No newline at end of file

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 20 May '16

20 May '16

commit fd0aafa05a711f6e0dc39904e380da1fa8bdf1d2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 20 19:16:22 2016 +0000 Update translations for tor-messenger-fingerdtd --- zh_CN/finger.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_CN/finger.dtd b/zh_CN/finger.dtd index e1afbd2..216377e 100644 --- a/zh_CN/finger.dtd +++ b/zh_CN/finger.dtd @@ -8,8 +8,8 @@ <!ENTITY finger.verify "验证"> <!ENTITY finger.remove "移除"> <!ENTITY finger.intro "管理已知指纹列表。"> -<!ENTITY addFingerDialog.title "Add Fingerprint"> -<!ENTITY addFingerDialog.finger "Fingerprint"> -<!ENTITY addFingerDialog.accept "OK"> -<!ENTITY addFingerDialog.cancel "Skip"> -<!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file +<!ENTITY addFingerDialog.title "添加指纹"> +<!ENTITY addFingerDialog.finger "指纹"> +<!ENTITY addFingerDialog.accept "确定"> +<!ENTITY addFingerDialog.cancel "跳过"> +<!ENTITY addFingerDialog.tooltip "如果您知道您的联系人的 OTR 私钥的40位16进制指纹，现在请输入它。"> \ No newline at end of file

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 20 May '16

20 May '16

commit cc3739cae417c71784239885bae6e6fadc000101 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 20 17:16:46 2016 +0000 Update translations for tails-onioncircuits_completed --- es/onioncircuits.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/onioncircuits.pot b/es/onioncircuits.pot index 4a227d7..816959c 100644 --- a/es/onioncircuits.pot +++ b/es/onioncircuits.pot @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-31 21:27+0000\n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-05-20 17:14+0000\n" "Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0