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

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit a6eaa121e47625f9e9195b87c18f85d1307ee409 Merge: df87812 1d91bf5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 23 08:06:19 2016 -0500 Merge branch 'maint-0.2.9' src/common/compat_time.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'bug21035' into maint-0.2.9
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit 1d91bf57dfe83a7976d8cf7e5e6a6acfae94d022 Merge: 490cd03 a757f76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 23 08:06:11 2016 -0500 Merge branch 'bug21035' into maint-0.2.9 src/common/compat_time.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 23 Dec '16

23 Dec '16

commit 8d3f412cdace9bec7883152735103ffedbd8ad65 Merge: 8698765 1d91bf5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 23 08:06:25 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 src/common/compat_time.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 23 Dec '16

23 Dec '16

commit 77c466fa90e49f96b79f6293cdd4ee5fc85c6318 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 23 11:48:22 2016 +0000 Update translations for tor-browser-manual_completed --- zh_TW/zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index cdca3aa..8426d14 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -1288,7 +1288,7 @@ msgid "" msgstr "" "obfs4 可以像 obfs3 " "一樣讓洋蔥路由所傳送的網路訊號看起來像是隨機亂數一般，並且還可以避免網路過濾監控機制利用網段掃描法找出橋接器的位址，因此相較之下 obfs4 " -"橋接器更能夠迴避被過濾機制阻擋。" +"橋接器更難以被網路監控過濾機制阻擋。" #: transports.page:56 msgid "Scramblesuit"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 23 Dec '16

23 Dec '16

commit 8ad80af45787b3151f37fbdeb487a39987b49314 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 23 11:48:18 2016 +0000 Update translations for tor-browser-manual --- zh_TW/zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index cdca3aa..8426d14 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -1288,7 +1288,7 @@ msgid "" msgstr "" "obfs4 可以像 obfs3 " "一樣讓洋蔥路由所傳送的網路訊號看起來像是隨機亂數一般，並且還可以避免網路過濾監控機制利用網段掃描法找出橋接器的位址，因此相較之下 obfs4 " -"橋接器更能夠迴避被過濾機制阻擋。" +"橋接器更難以被網路監控過濾機制阻擋。" #: transports.page:56 msgid "Scramblesuit"

1 0

[metrics-web/master] Add 0.2.9 to known versions.
by karsten＠torproject.org 23 Dec '16

23 Dec '16

commit d464cf371b410166eebdc0ed2bdc97f8bd45a142 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 23 10:11:12 2016 +0100 Add 0.2.9 to known versions. Fixes #21066. --- website/rserve/graphs.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R index f742fe3..5c296a8 100644 --- a/website/rserve/graphs.R +++ b/website/rserve/graphs.R @@ -350,7 +350,7 @@ plot_versions <- function(start, end, path) { relays = s$relays) known_versions <- c("Other", "0.1.0", "0.1.1", "0.1.2", "0.2.0", "0.2.1", "0.2.2", "0.2.3", "0.2.4", "0.2.5", "0.2.6", "0.2.7", - "0.2.8") + "0.2.8", "0.2.9") getPalette = colorRampPalette(brewer.pal(12, "Paired")) colours <- data.frame(breaks = known_versions, values = rep(brewer.pal(min(12, length(known_versions)), "Paired"),

1 0

[webwml/master] coming to us with tlsdate stuff isn't going to make anybody happy
by arma＠torproject.org 23 Dec '16

23 Dec '16

commit 3c259a44d6dee8b3f6273ae7315a2372c9bf30c7 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Dec 23 00:11:22 2016 -0500 coming to us with tlsdate stuff isn't going to make anybody happy --- getinvolved/en/volunteer.wml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 8f785db..a645967 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -248,14 +248,6 @@ meetings around the world.</li> </tr> <tr> - <td><a href="#project-tlsdate">Tlsdate</a></td> - <td>Utility</td> - <td>C</td> - <td>None</td> - <td>ioerror</td> - </tr> - - <tr> <td><a href="#project-metrics">Metrics</a></td> <td>Client Service</td> <td>Java</td> @@ -602,21 +594,6 @@ meetings around the world.</li> <i><a href="#txtorcon_use_pytest">Convert txtorcon to py.test</a></i> </p> - <a id="project-tlsdate"></a> - <h3>Tlsdate (<a href="https://github.com/ioerror/tlsdate">code</a>)</h3> - - <p> - tlsdate: secure parasitic rdate replacement - </p> - - <p> - tlsdate sets the local clock by securely connecting with TLS to remote - servers and extracting the remote time out of the secure handshake. Unlike - ntpdate, tlsdate uses TCP, for instance connecting to a remote HTTPS or TLS - enabled service, and provides some protection against adversaries that try - to feed you malicious time information. - </p> - <a id="project-metrics"></a> <h3><a href="https://metrics.torproject.org/">Metrics</a> (<a href="https://gitweb.torproject.org/metrics-web.git">web</a>)</h3>

1 0

[sandboxed-tor-browser/master] Don't mess with the security slider at all.
by yawning＠torproject.org 23 Dec '16

23 Dec '16

commit d2944eae3c903e7bffec2c6e3249a8dd4a432c8b Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Dec 23 03:30:22 2016 +0000 Don't mess with the security slider at all. GeKo seems to think it will drive users away, and more to the point, the fucking `defaultPref` directive doesn't appear to actually take, while `pref` and `lockPref` with the same arguments does. --- ChangeLog | 1 - data/installer/mozilla.cfg | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae90e9c..bdd0e2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,6 @@ Changes in version 0.0.3 - UNRELEASED: * Bug 20806: Try even harder to exclude gstreamer. * Add a `-h` command line flag that prints usage. * Remove the unused `pulseAudioBox` identifier. - * Set the security slider to "High" by default on a fresh install. * Store the version of the sandbox in the config file, and re-Sync() the config, and reinstall the `mozilla.cfg` when things change. * Include the git revision as a static asset, and display it as part of diff --git a/data/installer/mozilla.cfg b/data/installer/mozilla.cfg index 4322906..d4448d0 100644 --- a/data/installer/mozilla.cfg +++ b/data/installer/mozilla.cfg @@ -17,5 +17,6 @@ lockPref("extensions.torbutton.versioncheck_enabled", false); lockPref("extensions.update.enabled", false); lockPref("extensions.update.autoUpdateDefault", false); -// Set the security slider to "High" by default. -defaultPref("extensions.torbutton.security_slider", 1); +// Set the security slider to "High" by default, if the fucking `defaultPref` +// directive worked as advertised. But it doesn't appear to actually take. +// defaultPref("extensions.torbutton.security_slider", 1);

1 0

[stem/master] Also ignoring shared-rand-previous-value ordering
by atagar＠torproject.org 23 Dec '16

23 Dec '16

commit c5092535e1fa818c657956460d13ecacd0854e33 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Dec 22 18:36:57 2016 -0800 Also ignoring shared-rand-previous-value ordering Same issue as the prior commit but another field. Took a while to show up because it wasn't in the consensus at the time. --- stem/descriptor/networkstatus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 028594d..7456b37 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -1110,7 +1110,7 @@ def _check_for_misordered_fields(entries, expected): # # https://trac.torproject.org/projects/tor/ticket/21059 - actual = [field for field in entries.keys() if field in expected and field != 'shared-rand-current-value'] + actual = [field for field in entries.keys() if field in expected and field not in ('shared-rand-current-value', 'shared-rand-previous-value')] # Narrow the expected to just what we have. If the lists then match then the # order's valid.

1 0

[tor-messenger-build/master] Add patch to make_incremental_update.sh
by arlo＠torproject.org 22 Dec '16

22 Dec '16

commit b40caaa3794ac297df39941f9c7edc87e3b365a1 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Dec 22 11:00:52 2016 -0800 Add patch to make_incremental_update.sh --- projects/mozilla/0006-Updater-fixups-for-TM.patch | 113 +++++++++++++++++++-- ...ing-exceptions-even-w-inPrivateBrowsingMo.patch | 2 +- 2 files changed, 106 insertions(+), 9 deletions(-) diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index 54397a6..a8b017a 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From 803f92640e5a0856a5c78ccba5c4845144b88af3 Mon Sep 17 00:00:00 2001 +From 08e87872bdf1b8b4fb643682cf33005ba335ba9b Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 09:34:38 -0700 Subject: [PATCH 6/7] Updater fixups for TM @@ -8,14 +8,17 @@ Subject: [PATCH 6/7] Updater fixups for TM * Copy over the der's and TM update logo * Trac 20309: s/TorBrowser-Data/TorMessenger-Data/ + + * Patch the make_incremental_update.sh for ctypes-otr --- - .../base/content/abouttbupdate/aboutTBUpdateLogo.png | Bin 23266 -> 2724 bytes - toolkit/mozapps/update/content/updates.js | 2 +- - toolkit/mozapps/update/content/updates.xul | 13 +++++-------- - toolkit/mozapps/update/updater/release_primary.der | Bin 1229 -> 1233 bytes - toolkit/mozapps/update/updater/release_secondary.der | Bin 1229 -> 1235 bytes - xpcom/io/TorFileUtils.cpp | 2 +- - 6 files changed, 7 insertions(+), 10 deletions(-) + .../content/abouttbupdate/aboutTBUpdateLogo.png | Bin 23266 -> 2724 bytes + toolkit/mozapps/update/content/updates.js | 2 +- + toolkit/mozapps/update/content/updates.xul | 13 ++-- + toolkit/mozapps/update/updater/release_primary.der | Bin 1229 -> 1233 bytes + .../mozapps/update/updater/release_secondary.der | Bin 1229 -> 1235 bytes + tools/update-packaging/make_incremental_update.sh | 80 +++++---------------- + xpcom/io/TorFileUtils.cpp | 2 +- + 7 files changed, 23 insertions(+), 74 deletions(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdateLogo.png b/browser/base/content/abouttbupdate/aboutTBUpdateLogo.png index be5cae93fa96ffa71b3195eb36b5d3c955be3ef4..3de3c93d1105a0220ba0922e4c9a101755b126a9 100644 @@ -692,6 +695,100 @@ zbKGzWvzA3x>-Q;}s(c?EU%K*g(yXNug*g2LUV7#omDwqM^}v1Y7{@L4?QERgdQ$to zHAIICCiYIYSX`mIUcOp4Id^^h+f`jW<`?chRNi!yt6Nd*2j3*8u$&(cmR(l9;<#d+ W@ahR1{w+qA19CVV{J*b~TmS$gHy@k; +diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh +index dc9097e3a8ea..5a6eac37a506 100755 +--- a/tools/update-packaging/make_incremental_update.sh ++++ b/tools/update-packaging/make_incremental_update.sh +@@ -132,73 +132,25 @@ archivefiles="updatev2.manifest updatev3.manifest" + # releases, add them to the "force updates" list. + ext_path='TorBrowser/Data/Browser/profile.default/extensions' + if [ -d "$newdir/$ext_path" ]; then +- https_everywhere_dir='https-everywhere-eff(a)eff.org' +- https_everywhere_xpi='https-everywhere-eff(a)eff.org.xpi' +- noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' +- +- # NoScript is a packed extension, so we simply compare the old and the new +- # .xpi files. +- noscript_path="$ext_path/$noscript" +- diff -a "$olddir/$noscript_path" "$newdir/$noscript_path" > /dev/null ++ ctypes_otr_dir='ctypes-otr@tormessenger' ++ unpacked_ctypes_otr_install_rdf="$ext_path/$ctypes_otr_dir/install.rdf" ++ ++ # The new ctypes-otr extension is unpacked, and presumably the old one is ++ # too. We need to determine if any of the unpacked files have changed. ++ # Since that is messy, we simply compare the old install.rdf file to the ++ # new one. ++ diff "$olddir/$unpacked_ctypes_otr_install_rdf" \ ++ "$newdir/$unpacked_ctypes_otr_install_rdf" > /dev/null + rc=$? +- if [ $rc -gt 1 ]; then +- notice "Unexpected exit $rc from $noscript_path diff command" ++ if [ $rc -gt 1 -a -e "$olddir/$unpacked_ctypes_otr_install_rdf" ]; then ++ notice "Unexpected exit $rc from $unpacked_ctypes_otr_install_rdf diff command" + exit 2 +- elif [ $rc -eq 1 ]; then +- requested_forced_updates="$requested_forced_updates $noscript_path" +- fi ++ elif [ $rc -ge 1 ]; then ++ requested_forced_updates="$requested_forced_updates $ext_path/$ctypes_otr_dir/*" + +- # As of HTTPS Everywhere 5.1.0, the extension ID gained "-eff". +- # As of HTTPS Everywhere 5.2.2, the extension is packed (i.e., it remains +- # an .xpi after it is installed in the browser profile). +- force_https_update=0 +- remove_unpacked_https_e_dirs=0 +- unpacked_https_e_install_rdf="$ext_path/$https_everywhere_dir/install.rdf" +- packed_https_e_path="$ext_path/$https_everywhere_xpi" +- if [ -d "$newdir/$ext_path/$https_everywhere_dir" ]; then +- # The new HTTPS-E extension is unpacked, and presumably the old one is +- # too. We need to determine if any of the unpacked files have changed. +- # Since that is messy, we simply compare the old install.rdf file to the +- # new one. +- diff "$olddir/$unpacked_https_e_install_rdf" \ +- "$newdir/$unpacked_https_e_install_rdf" > /dev/null +- rc=$? +- if [ $rc -gt 1 -a -e "$olddir/$unpacked_https_e_install_rdf" ]; then +- notice "Unexpected exit $rc from $unpacked_https_e_install_rdf diff command" +- exit 2 +- elif [ $rc -ge 1 ]; then +- force_https_update=1 +- remove_unpacked_https_e_dirs=1 +- # In case we still ship an unpacked HTTPS-E extension but the user has +- # updated to a packed one, arrange for the packed one to be removed. +- extra_files_to_remove="$extra_files_to_remove $packed_https_e_path" +- fi +- elif [ -d "$olddir/$ext_path/$https_everywhere_dir" ]; then +- # The old HTTPS-E extension is unpacked but the new one is packed. +- force_https_update=1 +- remove_unpacked_https_e_dirs=1 +- else +- # Both the old and new HTTPS-E extensions are packed. In this case we can +- # simply compare the .xpi files to determine if the extension has changed. +- diff -a "$olddir/$packed_https_e_path" "$newdir/$packed_https_e_path" > /dev/null +- rc=$? +- if [ $rc -gt 1 ]; then +- notice "Unexpected exit $rc from $packed_https_e_path diff command" +- exit 2 +- elif [ $rc -eq 1 ]; then +- force_https_update=1 +- fi +- fi +- +- if [ $force_https_update -ne 0 ]; then +- requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere_dir/* $packed_https_e_path" +- if [ "$remove_unpacked_https_e_dirs" -ne 0 ]; then +- # The old version was unpacked, so remove the entire directory to ensure +- # that the replace is "clean." Also, make sure we delete the pre 5.1.0 +- # HTTPS Everywhere as well in case it exists (the extension ID got +- # changed with the version bump to 5.1.0). +- directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere_dir" +- fi ++ # The old version was unpacked, so remove the entire directory to ensure ++ # that the replace is "clean." ++ directories_to_remove="$directories_to_remove $ext_path/$ctypes_otr_dir" + fi + fi + # END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp index c45961ac54e7..23d6fbe2929a 100644 --- a/xpcom/io/TorFileUtils.cpp diff --git a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch index dce5f48..da802fa 100644 --- a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch +++ b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -1,4 +1,4 @@ -From ef983cda8e98135413d12e8d7f4c3787db92670e Mon Sep 17 00:00:00 2001 +From 57e056fd04d9e6b49ef84217dce3702959c1a9b3 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sat, 3 Dec 2016 10:01:52 -0800 Subject: [PATCH 7/7] Permit storing exceptions even w/ inPrivateBrowsingMode

1 0