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

[webwml/master] remove 'wily' as an option since it's dead
by arma＠torproject.org 21 Sep '16

21 Sep '16

commit d426ebf8885e4a69b1ce1f1ae611352111453bf3 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 21 14:05:10 2016 -0400 remove 'wily' as an option since it's dead resolves https://bugs.torproject.org/18021 --- docs/en/debian.wml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index de91aaa..411985e 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -18,7 +18,6 @@ var software = { 'sid': [ 'sid' ], 'precise': [ 'precise'], 'trusty': [ 'trusty'], - 'wily': [ 'wily'], 'xenial': [ 'xenial'], }, 'experimental-0.2.9.x': { @@ -28,7 +27,6 @@ var software = { 'sid': [ 'sid' ], 'precise': [ 'precise'], 'trusty': [ 'trusty'], - 'wily': [ 'wily'], 'xenial': [ 'xenial'], }, }, @@ -40,7 +38,6 @@ var software = { 'sid': [ 'sid' ], 'precise': [ 'precise'], 'trusty': [ 'trusty'], - 'wily': [ 'wily'], 'xenial': [ 'xenial'], }, 'experimental-0.2.9.x': { @@ -50,7 +47,6 @@ var software = { 'sid': [ 'sid' ], 'precise': [ 'precise'], 'trusty': [ 'trusty'], - 'wily': [ 'wily'], 'xenial': [ 'xenial'], }, }, @@ -239,7 +235,6 @@ I run <option value="sid">Debian unstable (sid)</option> <option value="precise">Ubuntu Precise Pangolin</option> <option value="trusty">Ubuntu Trusty Tahr</option> -<option value="wily">Ubuntu Wily Werewolf</option> <option value="xenial">Ubuntu Xenial Xerus</option> </select> and want

1 0

[tor-messenger-build/master] Add a patch for bugzilla 1246431
by arlo＠torproject.org 21 Sep '16

21 Sep '16

commit 93273a064e48293c2695a20926bb4559524648fb Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Sep 21 10:39:32 2016 -0700 Add a patch for bugzilla 1246431 * https://bugzilla.mozilla.org/show_bug.cgi?id=1246431 --- projects/instantbird/bug-1246431.patch | 31 +++++++++++++++++++++++++++++++ projects/instantbird/config | 1 + 2 files changed, 32 insertions(+) diff --git a/projects/instantbird/bug-1246431.patch b/projects/instantbird/bug-1246431.patch new file mode 100644 index 0000000..649e5c2 --- /dev/null +++ b/projects/instantbird/bug-1246431.patch @@ -0,0 +1,31 @@ + +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1454792228 28800 +# Node ID 1759abefc9195a9110c89822fcaf051cd05b0132 +# Parent 27b50a06b9b2b977b31f0777ae8f3ea355cc1130 +Bug 1246431 - XMPP createConversation should handle incoming messages from the server properly. r=aleth + +diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm +--- a/chat/protocols/xmpp/xmpp.jsm ++++ b/chat/protocols/xmpp/xmpp.jsm +@@ -2096,17 +2096,17 @@ var XMPPAccountPrototype = { + // Checks if conversation is with a participant of a MUC we are in. We do + // not want to strip the resource as it is of the form room@domain/nick. + let isMucParticipant = this._mucs.has(convName); + if (isMucParticipant) + convName = this.normalizeFullJid(aName); + + // Checking that the aName can be parsed and is not broken. + let jid = this._parseJID(convName); +- if (!jid || !jid.node || (isMucParticipant && !jid.resource)) { ++ if (!jid || !jid.domain || (isMucParticipant && (!jid.node || !jid.resource))) { + this.ERROR("Could not create conversation as jid is broken: " + convName); + throw "Invalid JID"; + } + + if (!this._conv.has(convName)) { + this._conv.set(convName, + new this._conversationConstructor(this, convName, + isMucParticipant)); + diff --git a/projects/instantbird/config b/projects/instantbird/config index 9b72599..9012b53 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -75,6 +75,7 @@ input_files: - filename: xmppRegister.xul - filename: xmpp-gtalk-resource.patch - filename: bug-1298574.patch + - filename: bug-1246431.patch - filename: trac-16489.patch - filename: trac-17896.patch - filename: trac-17494.patch

1 0

[tor/master] Merge remote-tracking branch 'isis/bug20201'
by nickm＠torproject.org 21 Sep '16

21 Sep '16

commit f6d7b71719db2e158b28f21d6f4a3861d860b3b0 Merge: 62ee4f1 f1d7b7b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 21 12:20:33 2016 -0400 Merge remote-tracking branch 'isis/bug20201' src/or/config.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)

1 0

[tor/master] Update documentation for parse_bridge_line() in src/or/config.c.
by nickm＠torproject.org 21 Sep '16

21 Sep '16

commit f1d7b7b600f2388f347116a30f5bb40d9fa1ff6e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Sep 21 13:26:34 2016 +0000 Update documentation for parse_bridge_line() in src/or/config.c. * FIXES #20201: https://bugs.torproject.org/20201 --- src/or/config.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 9c5514f..ef2dfcd 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5325,10 +5325,14 @@ bridge_line_free(bridge_line_t *bridge_line) tor_free(bridge_line); } -/** Read the contents of a Bridge line from line. Return 0 - * if the line is well-formed, and -1 if it isn't. If - * validate_only is 0, and the line is well-formed, then add - * the bridge described in the line to our internal bridge list. +/** Parse the contents of a string, line, containing a Bridge line, + * into a bridge_line_t. + * + * Validates that the IP:PORT, fingerprint, and SOCKS arguments (given to the + * Pluggable Transport, if a one was specified) are well-formed. + * + * Returns NULL If the Bridge line could not be validated, and returns a + * bridge_line_t containing the parsed information otherwise. * * Bridge line format: * Bridge [transport] IP:PORT [id-fingerprint] [k=v] [k=v] ...

1 0

[webwml/master] Add new subkeys for Tor Browser's and gk's key
by sebastian＠torproject.org 21 Sep '16

21 Sep '16

commit 62c6eea47025b9ead396f01c5a71dde1b76cd039 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 21 12:44:51 2016 +0000 Add new subkeys for Tor Browser's and gk's key --- docs/en/signing-keys.wml | 5 +++-- docs/en/verifying-signatures.wml | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index 06ef0a4..343f266 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -103,8 +103,8 @@ pub 4096R/4B7C3223 2013-07-30 Key fingerprint = 35CD 74C2 4A9B 15A1 9E1A 81A1 9437 3AA9 4B7C 3223 uid Georg Koppen <gk(a)torproject.org> - sub 4096R/24690903 2015-07-20 [expires: 2016-07-19] - sub 4096R/631602F4 2015-07-20 [expires: 2016-07-19] + sub 4096R/0x2F7477373D6B000D 2016-08-01 [expires: 2017-09-11] + sub 4096R/0xAA602CC00C257CF7 2016-08-01 [expires: 2017-09-11] pub 4096R/D0220E4B 2014-03-19 Key fingerprint = 4A90 646C 0BAE D9D4 56AB 3111 E5B8 1856 D022 0E4B @@ -121,6 +121,7 @@ uid Tor Browser Developers (signing key) <torbrowser(a)torproject.org> sub 4096R/0x2E1AC68ED40814E0 2014-12-15 [expires: 2017-08-25] sub 4096R/0x7017ADCEF65C2036 2014-12-15 [expires: 2017-08-25] + sub 4096R/0xD1483FA6C3C07136 2016-08-24 [expires: 2018-08-24] pub 2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2017-05-09] Key fingerprint = B744 17ED DF22 AC9F 9E90 F491 42E8 6A2A 11F4 8D36 diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index 6d96984..94ad398 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -80,6 +80,7 @@ uid Tor Browser Developers (signing key) <torbrowser(a)torproject.org> sub 4096R/F65C2036 2014-12-15 sub 4096R/D40814E0 2014-12-15 + sub 4096R/C3C07136 2016-08-24 </pre> To verify the signature of the package you downloaded, you will need to download the ".asc" file as well. Assuming you downloaded the @@ -95,7 +96,8 @@ Currently valid subkey fingerprints are: <pre> 5242 013F 02AF C851 B1C7 36B8 7017 ADCE F65C 2036 - BA1E E421 BBB4 5263 180E 1FC7 2E1A C68E D408 14E0</pre> + BA1E E421 BBB4 5263 180E 1FC7 2E1A C68E D408 14E0 + A430 0A6B C93C 0877 A445 1486 D148 3FA6 C3C0 7136</pre> Notice that there is a warning because you haven't assigned a trust index to this person. This means that GnuPG verified that the key made @@ -131,7 +133,8 @@ Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 uid Tor Browser Developers (signing key) <torbrowser(a)torproject.org> sub 4096R/F65C2036 2014-12-15 - sub 4096R/D40814E0 2014-12-15</pre> + sub 4096R/D40814E0 2014-12-15 + sub 4096R/C3C07136 2016-08-24</pre> To verify the signature of the package you downloaded, you will need to download the ".asc" file as well. Assuming you downloaded the package and its signature to your Downloads folder, run: @@ -152,7 +155,8 @@ Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290</pre> Currently valid subkey fingerprints are: <pre> 5242 013F 02AF C851 B1C7 36B8 7017 ADCE F65C 2036 - BA1E E421 BBB4 5263 180E 1FC7 2E1A C68E D408 14E0</pre> + BA1E E421 BBB4 5263 180E 1FC7 2E1A C68E D408 14E0 + A430 0A6B C93C 0877 A445 1486 D148 3FA6 C3C0 7136</pre> Notice that there is a warning because you haven't assigned a trust index to this person. This means that GnuPG verified that the key made

1 0

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

21 Sep '16

commit ba5c92e0972b813133b3332476eb08aca88451bc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 21 11:48:08 2016 +0000 Update translations for tor-messenger-prefsdtd --- zh_CN/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/prefs.dtd b/zh_CN/prefs.dtd index 066dcac..1ec5de6 100644 --- a/zh_CN/prefs.dtd +++ b/zh_CN/prefs.dtd @@ -17,6 +17,6 @@ <!ENTITY prefs.coniksServerAddress "服务器地址"> <!ENTITY prefs.coniksServerPort "端口"> <!ENTITY prefs.coniksAccountPolicy "账户政策"> -<!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> +<!ENTITY prefs.coniksPoliciesForAccount "账号条款"> <!ENTITY prefs.coniksPrivateLookups "Private lookups"> <!ENTITY prefs.coniksSignedKeyChange "Signed key change"> \ No newline at end of file

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 21 Sep '16

21 Sep '16

commit f862c1bf210ce7277ff2b0bd413559fb885fb12b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 21 10:46:14 2016 +0000 Update translations for tor-launcher-network-settings_completed --- zh_CN/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 5997966..167a597 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -27,7 +27,7 @@ <!ENTITY torSettings.enterProxy "输入代理设置。"> <!ENTITY torSettings.bridgePageTitle "Tor 网桥配置"> <!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> -<!ENTITY torSettings.bridgeExplanation1 "如果你不确定此问题的答案，请选择否，（如果你在不使用网桥时无法连接到 Tor 网络，你可以稍后添加）。"> +<!ENTITY torSettings.bridgeExplanation1 "如果不确定，可选择否，之后不用网桥则无法连接时，可再尝试使用网桥。"> <!ENTITY torSettings.bridgeExplanation2 "如果您选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难被封锁。"> <!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 21 Sep '16

21 Sep '16

commit 6aaa9cd8817403a9b05a732f69efbea461d2dafa Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 21 10:46:08 2016 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 5997966..167a597 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -27,7 +27,7 @@ <!ENTITY torSettings.enterProxy "输入代理设置。"> <!ENTITY torSettings.bridgePageTitle "Tor 网桥配置"> <!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> -<!ENTITY torSettings.bridgeExplanation1 "如果你不确定此问题的答案，请选择否，（如果你在不使用网桥时无法连接到 Tor 网络，你可以稍后添加）。"> +<!ENTITY torSettings.bridgeExplanation1 "如果不确定，可选择否，之后不用网桥则无法连接时，可再尝试使用网桥。"> <!ENTITY torSettings.bridgeExplanation2 "如果您选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难被封锁。"> <!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。">

1 0

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

21 Sep '16

commit f3ff0ebb69911350123f7c51818da3da5c13d4a3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 21 07:18:27 2016 +0000 Update translations for tor-messenger-prefsdtd_completed --- it/prefs.dtd | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/it/prefs.dtd b/it/prefs.dtd index 58d210b..3dd1194 100644 --- a/it/prefs.dtd +++ b/it/prefs.dtd @@ -1,4 +1,6 @@ <!ENTITY prefs.otrPreferences "Preferenze OTR"> +<!ENTITY prefs.otrLabel "OTR"> +<!ENTITY prefs.coniksLabel "CONIKS"> <!ENTITY prefs.otrSettings "Impostazioni OTR"> <!ENTITY prefs.requireEncryption "Richiedi crittografia"> <!ENTITY prefs.otrKeys "Le mie chiavi private"> @@ -10,4 +12,11 @@ <!ENTITY prefs.introSettings "Queste impostazioni vengono applicate a tutte le conversazioni one-to-one."> <!ENTITY prefs.verifyNudge "Cerca sempre di verificare l'identità dei tuoi contatti."> <!ENTITY prefs.emptyAccountList "Nessun account configurato"> -<!ENTITY prefs.generate "Genera"> \ No newline at end of file +<!ENTITY prefs.generate "Genera"> +<!ENTITY prefs.coniksConnection "Connessione"> +<!ENTITY prefs.coniksServerAddress "Indirizzo server"> +<!ENTITY prefs.coniksServerPort "Porta"> +<!ENTITY prefs.coniksAccountPolicy "Policy account"> +<!ENTITY prefs.coniksPoliciesForAccount "Policy per l'account:"> +<!ENTITY prefs.coniksPrivateLookups "Ricerche private"> +<!ENTITY prefs.coniksSignedKeyChange "Modifica chiave firmata"> \ No newline at end of file

1 0

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

21 Sep '16

commit 517fb68547b412bd0c6c47409f713c34ac034f8e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 21 07:18:11 2016 +0000 Update translations for tor-messenger-prefsdtd --- it/prefs.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it/prefs.dtd b/it/prefs.dtd index 5c16407..3dd1194 100644 --- a/it/prefs.dtd +++ b/it/prefs.dtd @@ -18,5 +18,5 @@ <!ENTITY prefs.coniksServerPort "Porta"> <!ENTITY prefs.coniksAccountPolicy "Policy account"> <!ENTITY prefs.coniksPoliciesForAccount "Policy per l'account:"> -<!ENTITY prefs.coniksPrivateLookups "Private lookups"> -<!ENTITY prefs.coniksSignedKeyChange "Signed key change"> \ No newline at end of file +<!ENTITY prefs.coniksPrivateLookups "Ricerche private"> +<!ENTITY prefs.coniksSignedKeyChange "Modifica chiave firmata"> \ No newline at end of file

1 0