- tor-commits - lists.torproject.org

[webwml/master] add the fastly logo to our website
by arma＠torproject.org 21 May '16

21 May '16

commit d1e734d925dd5eda83707578223c6a34747f0957 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 14:21:49 2016 -0400 add the fastly logo to our website --- images/fastly-logo.png | Bin 0 -> 3658 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/fastly-logo.png b/images/fastly-logo.png new file mode 100644 index 0000000..3d83596 Binary files /dev/null and b/images/fastly-logo.png differ

1 0

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

21 May '16

commit 5f31ba38e76ed92c0923308977df929d20754a30 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 10:46:53 2016 +0000 Update translations for tails-onioncircuits_completed --- hu/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/onioncircuits.pot b/hu/onioncircuits.pot index 7554a5d..38625a0 100644 --- a/hu/onioncircuits.pot +++ b/hu/onioncircuits.pot @@ -11,7 +11,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-11 17:22+0000\n" +"PO-Revision-Date: 2016-05-21 10:18+0000\n" "Last-Translator: Falu\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n"

1 0

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

21 May '16

commit 413c2872210484c6739edaadb6cbcd9ae78c9703 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 10:46:50 2016 +0000 Update translations for tails-onioncircuits --- hu/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/onioncircuits.pot b/hu/onioncircuits.pot index 7554a5d..38625a0 100644 --- a/hu/onioncircuits.pot +++ b/hu/onioncircuits.pot @@ -11,7 +11,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-11 17:22+0000\n" +"PO-Revision-Date: 2016-05-21 10:18+0000\n" "Last-Translator: Falu\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\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 3454b26efb5b9fee9715c88eda378898054b4a97 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 10:46:26 2016 +0000 Update translations for tor-messenger-fingerdtd_completed --- hu/finger.dtd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hu/finger.dtd b/hu/finger.dtd index a6a014b..9cc151d 100644 --- a/hu/finger.dtd +++ b/hu/finger.dtd @@ -7,4 +7,9 @@ <!ENTITY finger.protocol "Protokoll"> <!ENTITY finger.verify "Megerősít"> <!ENTITY finger.remove "Eltávolít"> -<!ENTITY finger.intro "A látott ujjlenyomatok listájának kezelése."> \ No newline at end of file +<!ENTITY finger.intro "A látott ujjlenyomatok listájának kezelése."> +<!ENTITY addFingerDialog.title "Ujjlenyomat hozzáadás"> +<!ENTITY addFingerDialog.finger "Ujjlenyomat"> +<!ENTITY addFingerDialog.accept "OK"> +<!ENTITY addFingerDialog.cancel "Kihagy"> +<!ENTITY addFingerDialog.tooltip "Ha tudod az ismerősöd privát OTR kulcsának 40 karakteres, hexadecimális ujjlenyomatát, akkor itt megadhatod."> \ 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 8161ddf972df0f4c1a09fce538ef1ff02631b262 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 10:46:22 2016 +0000 Update translations for tor-messenger-fingerdtd --- hu/finger.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hu/finger.dtd b/hu/finger.dtd index b6cb0b7..9cc151d 100644 --- a/hu/finger.dtd +++ b/hu/finger.dtd @@ -8,8 +8,8 @@ <!ENTITY finger.verify "Megerősít"> <!ENTITY finger.remove "Eltávolít"> <!ENTITY finger.intro "A látott ujjlenyomatok listájának kezelése."> -<!ENTITY addFingerDialog.title "Add Fingerprint"> -<!ENTITY addFingerDialog.finger "Fingerprint"> +<!ENTITY addFingerDialog.title "Ujjlenyomat hozzáadás"> +<!ENTITY addFingerDialog.finger "Ujjlenyomat"> <!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.cancel "Kihagy"> +<!ENTITY addFingerDialog.tooltip "Ha tudod az ismerősöd privát OTR kulcsának 40 karakteres, hexadecimális ujjlenyomatát, akkor itt megadhatod."> \ No newline at end of file

1 0

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

21 May '16

commit 2a94854473ecbf331497c619c980728a7374602a Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 21 04:16:53 2016 +0000 Update translations for tails-onioncircuits_completed --- 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/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