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

[tor-messenger-build/master] Update XMPP in-band registration handling
by sukhbir＠torproject.org 30 Jun '15

30 Jun '15

commit 1942bb45928dc421740d83e02cf93d6f5425224f Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jun 30 04:00:46 2015 -0400 Update XMPP in-band registration handling --- projects/instantbird/branding/credits.patch | 22 ++++++++++++++++++++ .../instantbird/xmpp-inband-registration.patch | 15 ++++++++----- projects/instantbird/xmppRegister.js | 4 ++++ 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/projects/instantbird/branding/credits.patch b/projects/instantbird/branding/credits.patch index 26d09a4..108bb86 100644 --- a/projects/instantbird/branding/credits.patch +++ b/projects/instantbird/branding/credits.patch @@ -71,3 +71,25 @@ diff --git a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd b/im/locales/en  -<!ENTITY copyrightText2 "©2007-&copyrightYear; Contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later."> +<!ENTITY copyrightText2 "©&copyrightYear; Contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later."> +diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul +--- a/im/content/aboutDialog.xul ++++ b/im/content/aboutDialog.xul +@@ -9,17 +9,17 @@ + <?xul-overlay href="chrome://instantbird/content/menus.xul"?> + #endif + + <!DOCTYPE window [ + <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > + %brandDTD; + <!ENTITY % aboutDialogDTD SYSTEM "chrome://instantbird/locale/aboutDialog.dtd" > + %aboutDialogDTD; +-<!ENTITY copyrightYear "2014"> ++<!ENTITY copyrightYear "2015"> + #ifdef XP_MACOSX + <!ENTITY % instantbirdDTD SYSTEM "chrome://instantbird/locale/instantbird.dtd"> + %instantbirdDTD; + #endif + ]> + + <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + id="aboutDialog" diff --git a/projects/instantbird/xmpp-inband-registration.patch b/projects/instantbird/xmpp-inband-registration.patch index 73c838c..d8feebb 100644 --- a/projects/instantbird/xmpp-inband-registration.patch +++ b/projects/instantbird/xmpp-inband-registration.patch @@ -80,7 +80,7 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses return; let now = Date.now(); if (aJustSentSomething) -@@ -265,28 +268,95 @@ XMPPSession.prototype = { +@@ -265,28 +268,98 @@ XMPPSession.prototype = { _("connection.error.startTLSNotSupported")); return; } @@ -119,14 +119,17 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses + let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"] + .getService(Ci.nsIWindowWatcher); + let win = ww.openWindow(null, registerWindow, "", -+ "centerscreen,chrome,modal,minimizable=no", registerStanza); ++ "centerscreen,chrome,modal, ++ resizable=yes,minimizable=no", registerStanza); + } else { + this.onError(null, _("connection.error.noRegistrationSupport")); + } + + // If the user cancelled the form, we should stop the registration. -+ if (this.nodes["cancel"]) ++ if (this.nodes["cancel"]) { + this.onError(null, _("connection.error.registrationCancel")); ++ return; ++ } + + let xml = '<?xml version="1.0"?>'; + let fieldNodes = []; @@ -179,7 +182,7 @@ diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-ses diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js -@@ -106,16 +106,20 @@ var accountWizard = { +@@ -106,16 +106,22 @@ var accountWizard = { }, showUsernamePage: function aw_showUsernamePage() { @@ -191,6 +194,8 @@ diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js + + if (this.proto.id == "prpl-jabber") { + document.getElementById("registerXMPP").hidden = false; ++ } else { ++ document.getElementById("registerXMPP").hidden = true; + } let bundle = document.getElementById("accountsBundle"); @@ -200,7 +205,7 @@ diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js usernameInfo = bundle.getFormattedString("accountUsernameInfoWithDescription", [emptyText, this.proto.name]); -@@ -412,16 +416,18 @@ var accountWizard = { +@@ -412,16 +418,18 @@ var accountWizard = { createAccount: function aw_createAccount() { let acc = Services.accounts.createAccount(this.username, this.proto.id); if (!this.proto.noPassword && this.password) diff --git a/projects/instantbird/xmppRegister.js b/projects/instantbird/xmppRegister.js index 052fa6c..6983ad1 100644 --- a/projects/instantbird/xmppRegister.js +++ b/projects/instantbird/xmppRegister.js @@ -29,6 +29,10 @@ let registerAccount = { this.rows = document.getElementById("register-rows"); this.nodes = XMPPSession.prototype.nodes; + // Clear the existing elements from previous registrations. + for (let elem in this.nodes) + delete this.nodes[elem]; + this.registerStanza = window.arguments[0].wrappedJSObject; this.dataStanza = this.registerStanza.getElement(["x"]);

1 0

[tor/master] Try a little harder to fix the tor-ci-windows builder, or figure out why it is broke
by nickm＠torproject.org 29 Jun '15

29 Jun '15

commit 877354a9af4bbc6b2cdb15493c1fcc897eff4899 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 16:09:37 2015 -0400 Try a little harder to fix the tor-ci-windows builder, or figure out why it is broke --- src/common/address.c | 17 ++++++++++++++++- src/common/compat.c | 1 + src/win32/orconfig.h | 5 +++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/common/address.c b/src/common/address.c index d7d815e..80f65e9 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -14,8 +14,23 @@ #ifdef _WIN32 /* For access to structs needed by GetAdaptersAddresses */ -#include <process.h> +#ifndef WIN32_LEAN_AND_MEAN +#error "orconfig.h didn't define WIN32_LEAN_AND_MEAN" +#endif +#ifndef WINVER +#error "orconfig.h didn't define WINVER" +#endif +#ifndef _WIN32_WINNT +#error "orconfig.h didn't define _WIN32_WINNT" +#endif +#if WINVER < 0x0501 +#error "winver too low" +#endif +#if _WIN32_WINNT < 0x0501 +#error "winver too low" +#endif #include <winsock2.h> +#include <process.h> #include <windows.h> #include <iphlpapi.h> #endif diff --git a/src/common/compat.c b/src/common/compat.c index 74de9a5..7e50729 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -27,6 +27,7 @@ #include "compat.h" #ifdef _WIN32 +#include <winsock2.h> #include <windows.h> #include <sys/locking.h> #endif diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 9c780e8..af3c5f5 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -255,3 +255,8 @@ #ifndef STDERR_FILENO #define STDERR_FILENO 2 #endif + +#define WINVER 0x0501 +#define _WIN32_WINNT 0x0501 +#define WIN32_LEAN_AND_MEAN 1 +

1 0

[tor-messenger-build/master] Add --disable-crashreporter to mozconfig
by sukhbir＠torproject.org 29 Jun '15

29 Jun '15

commit d642f48a55b7126ec135874a0070bc8219618b7d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jun 29 15:56:32 2015 -0400 Add --disable-crashreporter to mozconfig --- projects/instantbird/mozconfig-linux-i686 | 2 ++ projects/instantbird/mozconfig-linux-x86_64 | 2 ++ projects/instantbird/mozconfig-osx-x86_64 | 2 ++ projects/instantbird/mozconfig-windows-i686 | 2 ++ 4 files changed, 8 insertions(+) diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686 index f0f59cf..8a2a9ff 100644 --- a/projects/instantbird/mozconfig-linux-i686 +++ b/projects/instantbird/mozconfig-linux-i686 @@ -24,3 +24,5 @@ ac_add_options --host=i686-linux-gnu ac_add_options --with-branding=im/branding/messenger ac_add_options --disable-updater + +ac_add_options --disable-crashreporter diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64 index d0333aa..d14b06c 100644 --- a/projects/instantbird/mozconfig-linux-x86_64 +++ b/projects/instantbird/mozconfig-linux-x86_64 @@ -20,3 +20,5 @@ ac_add_options --with-l10n-base=.. ac_add_options --with-branding=im/branding/messenger ac_add_options --disable-updater + +ac_add_options --disable-crashreporter diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64 index 25af3cc..0c679cf 100644 --- a/projects/instantbird/mozconfig-osx-x86_64 +++ b/projects/instantbird/mozconfig-osx-x86_64 @@ -31,3 +31,5 @@ ac_add_options --with-l10n-base=.. ac_add_options --with-branding=im/branding/messenger ac_add_options --disable-updater + +ac_add_options --disable-crashreporter diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index 01dd873..2d4a5c4 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -30,3 +30,5 @@ ac_add_options --disable-signmar ac_add_options --with-branding=im/branding/messenger ac_add_options --disable-updater + +ac_add_options --disable-crashreporter

1 0

[translation/tor-messenger-authproperties_completed] Update translations for tor-messenger-authproperties_completed
by translation＠torproject.org 29 Jun '15

29 Jun '15

commit f2bcc63dac34d112cd1b5c90e46673fa516cd57d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 19:46:35 2015 +0000 Update translations for tor-messenger-authproperties_completed --- fa/auth.properties | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/fa/auth.properties b/fa/auth.properties new file mode 100644 index 0000000..2c0aac3 --- /dev/null +++ b/fa/auth.properties @@ -0,0 +1,12 @@ +auth.title=هویت %S را تایید کنید +auth.yourFingerprint=اثر انگشت شما، %S:\n%S +auth.theirFingerprint=اثر انگشت اعدایی %S:\n%S +auth.help=تایید هویت طرف مقابل به شما کمک میکند مطمین شوید با همان کسی صحبت میکنید که ادعا میکند باشد. +auth.helpTitle=راهنمای تایید هویت +auth.question=این سوال توسط طرف مقابل پرسیده شده:\n\n%S\n\nجواب را اینجا وارد کنید (حساس به بزرگی و کوچکی حروف): +auth.secret=راز را اینجا وارد کنید: +auth.error=در هنگام تایید هویت طرف مقابل، خطایی رخ داد. +auth.success=تایید هویت طرف مقابل با موفقیت انجام شد. +auth.successThem=طرف مقابل با موفقیت هویت شما را تایید کرده است. شما هم میتوانید با پرسیدن سوال، هویت ایشان را تایید کنید. +auth.fail=تایید هویت طرف مقابل ناموفق بود. +auth.done=انجام شد

1 0

[translation/tor-messenger-authproperties] Update translations for tor-messenger-authproperties
by translation＠torproject.org 29 Jun '15

29 Jun '15

commit 9f2350aececee3e0c770194ed6aab49c18605a2c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 19:46:31 2015 +0000 Update translations for tor-messenger-authproperties --- fa/auth.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fa/auth.properties b/fa/auth.properties index 0a8d9db..2c0aac3 100644 --- a/fa/auth.properties +++ b/fa/auth.properties @@ -1,12 +1,12 @@ auth.title=هویت %S را تایید کنید auth.yourFingerprint=اثر انگشت شما، %S:\n%S auth.theirFingerprint=اثر انگشت اعدایی %S:\n%S -auth.help=Verifying a contact's identity helps ensure that the person you are talking to is who they claim to be. +auth.help=تایید هویت طرف مقابل به شما کمک میکند مطمین شوید با همان کسی صحبت میکنید که ادعا میکند باشد. auth.helpTitle=راهنمای تایید هویت -auth.question=This is the question asked by your contact:\n\n%S\n\nEnter secret answer here (case sensitive): +auth.question=این سوال توسط طرف مقابل پرسیده شده:\n\n%S\n\nجواب را اینجا وارد کنید (حساس به بزرگی و کوچکی حروف): auth.secret=راز را اینجا وارد کنید: auth.error=در هنگام تایید هویت طرف مقابل، خطایی رخ داد. auth.success=تایید هویت طرف مقابل با موفقیت انجام شد. -auth.successThem=Your contact has successfully verified your identity. You may want to verify their identity as well by asking your own question. +auth.successThem=طرف مقابل با موفقیت هویت شما را تایید کرده است. شما هم میتوانید با پرسیدن سوال، هویت ایشان را تایید کنید. auth.fail=تایید هویت طرف مقابل ناموفق بود. auth.done=انجام شد

1 0

[translation/tor-messenger-authdtd_completed] Update translations for tor-messenger-authdtd_completed
by translation＠torproject.org 29 Jun '15

29 Jun '15

commit 31fdf578384558fb55bf4f92494807967e25e07b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 19:46:27 2015 +0000 Update translations for tor-messenger-authdtd_completed --- fa/auth.dtd | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/fa/auth.dtd b/fa/auth.dtd new file mode 100644 index 0000000..946bbf3 --- /dev/null +++ b/fa/auth.dtd @@ -0,0 +1,21 @@ +<!ENTITY authDialog.title "بررسی هویت طرف مقابل"> +<!ENTITY authDialog.authenticate "تایید"> +<!ENTITY authDialog.cancel "لغو کن"> +<!ENTITY authDialog.help "راهنما"> +<!ENTITY authDialog.yes "بله"> +<!ENTITY authDialog.no "خیر"> +<!ENTITY authDialog.verified "بررسی و تایید کردم که این اثر انگشت درسته."> +<!ENTITY authDialog.yourFingerprint "اثر انگشت شما"> +<!ENTITY authDialog.theirFingerprint "اثر انگشت ادعایی شان"> +<!ENTITY authDialog.manualVerification "تایید اثر انگشت بصورت دستی"> +<!ENTITY authDialog.questionAndAnswer "پرسش و پاسخ"> +<!ENTITY authDialog.sharedSecret "راز مشترک"> +<!ENTITY authDialog.manualInstruction "برای تایید اثر انگشت، با دوستتان از راهی تصدیق شده مثل تلفن یا ایمیل با امضای دیجیتالی GPG تماس بگیرید. هرکدام از شما باید اثر انگشت خودتان را به هم بگویید. اگر همه چیز مطابقت میکرد، در کادر پایین مشخص کنید که اثر انگشت را تایید کرده‌اید."> +<!ENTITY authDialog.choose "انتخاب"> +<!ENTITY authDialog.how "چطور میخواهید هویت طرف مقابل را تایید کنید؟"> +<!ENTITY authDialog.qaInstruction "برای تایید هویت، سوالی بپرسید که فقط جواب آن را شما و طرف مقابل میدانید. سوال و جواب را وارد کنید و منتظر طرف مقابل باشید تا او هم جواب را وارد کند. اگر جواب‌ها مطابقت نکنند، احتمالن با شخصی صحبت میکنید که خودش را بجای دوست شما جا زده."> +<!ENTITY authDialog.secretInstruction "برای تایید هویت، رازی را انتخاب کنید که فقط شما و طرف مقابل میدانید. راز را وارد کنید و بعد منتظر طرف مقابل باشید تا او هم جواب را وارد کند. اگر جواب‌ها مطابقت نکنند، احتمالن با شخصی صحبت میکنید که خودش را بجای دوست شما جا زده."> +<!ENTITY authDialog.question "سوال را اینجا وارد کنید:"> +<!ENTITY authDialog.answer "پاسخ مخفی را در اینجا وارد کنید (حساس به بزرگی و کوچکی حروف):"> +<!ENTITY authDialog.secret "راز را اینجا وارد کنید:"> +<!ENTITY authDialog.waiting "منتظر طرف مقابل ..."> \ No newline at end of file

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 29 Jun '15

29 Jun '15

commit 82f4dc11a329e51a613cc460851345afe15f2ded Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 29 19:46:23 2015 +0000 Update translations for tor-messenger-authdtd --- fa/auth.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fa/auth.dtd b/fa/auth.dtd index 336bee1..946bbf3 100644 --- a/fa/auth.dtd +++ b/fa/auth.dtd @@ -10,11 +10,11 @@ <!ENTITY authDialog.manualVerification "تایید اثر انگشت بصورت دستی"> <!ENTITY authDialog.questionAndAnswer "پرسش و پاسخ"> <!ENTITY authDialog.sharedSecret "راز مشترک"> -<!ENTITY authDialog.manualInstruction "To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the dialog below that you have verified the fingerprint."> +<!ENTITY authDialog.manualInstruction "برای تایید اثر انگشت، با دوستتان از راهی تصدیق شده مثل تلفن یا ایمیل با امضای دیجیتالی GPG تماس بگیرید. هرکدام از شما باید اثر انگشت خودتان را به هم بگویید. اگر همه چیز مطابقت میکرد، در کادر پایین مشخص کنید که اثر انگشت را تایید کرده‌اید."> <!ENTITY authDialog.choose "انتخاب"> <!ENTITY authDialog.how "چطور میخواهید هویت طرف مقابل را تایید کنید؟"> -<!ENTITY authDialog.qaInstruction "To verify their identity, pick a question whose answer is known only to you and your contact. Enter this question and answer, then wait for your contact to enter the answer as well. If the answers do not match, then you may be talking to an imposter."> -<!ENTITY authDialog.secretInstruction "To verify their identity, pick a secret known only to you and your contact. Enter this secret, then wait for your contact to enter it as well. If the secrets do not match, then you may be talking to an imposter."> +<!ENTITY authDialog.qaInstruction "برای تایید هویت، سوالی بپرسید که فقط جواب آن را شما و طرف مقابل میدانید. سوال و جواب را وارد کنید و منتظر طرف مقابل باشید تا او هم جواب را وارد کند. اگر جواب‌ها مطابقت نکنند، احتمالن با شخصی صحبت میکنید که خودش را بجای دوست شما جا زده."> +<!ENTITY authDialog.secretInstruction "برای تایید هویت، رازی را انتخاب کنید که فقط شما و طرف مقابل میدانید. راز را وارد کنید و بعد منتظر طرف مقابل باشید تا او هم جواب را وارد کند. اگر جواب‌ها مطابقت نکنند، احتمالن با شخصی صحبت میکنید که خودش را بجای دوست شما جا زده."> <!ENTITY authDialog.question "سوال را اینجا وارد کنید:"> <!ENTITY authDialog.answer "پاسخ مخفی را در اینجا وارد کنید (حساس به بزرگی و کوچکی حروف):"> <!ENTITY authDialog.secret "راز را اینجا وارد کنید:">

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #16315: Test spoofed media queries in picture elements
by gk＠torproject.org 29 Jun '15

29 Jun '15

commit 452f870c8dff8089f759c9052960ad7fc73866a0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Jun 20 16:10:34 2015 -0700 Bug #16315: Test spoofed media queries in picture elements --- tbb-tests/match.png | Bin 0 -> 1210 bytes tbb-tests/mismatch.png | Bin 0 -> 1573 bytes tbb-tests/mochitest.ini | 3 +++ tbb-tests/test_tor_bug2875.html | 38 ++++++++++++++++++++++++++++++++------ 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/tbb-tests/match.png b/tbb-tests/match.png new file mode 100644 index 0000000..d3f299b Binary files /dev/null and b/tbb-tests/match.png differ diff --git a/tbb-tests/mismatch.png b/tbb-tests/mismatch.png new file mode 100644 index 0000000..8f9da3f Binary files /dev/null and b/tbb-tests/mismatch.png differ diff --git a/tbb-tests/mochitest.ini b/tbb-tests/mochitest.ini index 1434f89..2dc049a 100644 --- a/tbb-tests/mochitest.ini +++ b/tbb-tests/mochitest.ini @@ -1,4 +1,7 @@ [DEFAULT] +support-files = + match.png + mismatch.png [test_tor_bug2874.html] [test_tor_bug2875.html] diff --git a/tbb-tests/test_tor_bug2875.html b/tbb-tests/test_tor_bug2875.html index 3c34f3b..5eb3370 100644 --- a/tbb-tests/test_tor_bug2875.html +++ b/tbb-tests/test_tor_bug2875.html @@ -9,7 +9,11 @@ https://trac.torproject.org/projects/tor/ticket/2875 <title>Test for Tor Bug #2875: Limit device and system specific CSS Media Queries</title> <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> - <script type="application/javascript"> + <script type="application/javascript;version=1.7"> +let test = function () { + + SimpleTest.waitForExplicitFinish(); + var keyValMatches = ([key, val]) => matchMedia("(" + key + ":" + val +")").matches; // Default spoofed values by Tor Browser: @@ -51,23 +55,45 @@ https://trac.torproject.org/projects/tor/ticket/2875 ]; tor_suppressed_toggles.map(key => ok(!keyValMatches([key, 0]) && !keyValMatches([key, 1]), - key + " should not exist.")); + key + " should not exist.")); var foundOSVersion = false; ["windows-xp", "windows-vista", "windows-win7", "windows-win8"].map(function (val) { foundOSVersion = foundOSVersion || keyValMatches(["-moz-os-version", val]); }); ok(!foundOSVersion, "-moz-os-version should have no match"); - + + // Test media queries in picture elements (Tor Bug #16315) + let lines = ""; + for (let [query, expected] of tor_defaults) { + lines += "<picture>\n"; + lines += " <source srcset='match.png' media='(" + query + ": " + expected + ")'>\n"; + lines += " <img class='testImage' src='mismatch.png' alt='" + query + "'>\n"; + lines += "</picture><br>\n"; + } + document.getElementById("content").innerHTML += lines; + var testImages = document.getElementsByClassName("testImage"); + window.setTimeout(function () { + for (let testImage of testImages) { + ok(testImage.currentSrc.endsWith("/match.png"), "Media query in picture should match."); + } + SimpleTest.finish(); + }, 0); + +}; + </script> </head> <body> <a target="_blank" href="https://trac.torproject.org/projects/tor/ticket/2875">Tor Bug 2875</a> <p id="display"></p> -<div id="content" style="display: none"> - -</div> +<div id="content"></div> <pre id="test"> </pre> +<script> + window.onload = function () { + test(); + } +</script> </body> </html>

1 0

[tor-messenger-build/master] Remove automatic configuration of HS addresses
by sukhbir＠torproject.org 29 Jun '15

29 Jun '15

commit 25d84b87878b00198358dfdd8921369150d6d947 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jun 29 14:34:05 2015 -0400 Remove automatic configuration of HS addresses Tor Messenger configures HS access for known XMPP servers. Based on discussion as commented in #13855 (comment 7 onwards), we are disabling this feature for now by removing the patches from the build process. --- projects/instantbird/config | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 3caba4c..11c3b36 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -84,9 +84,6 @@ input_files: - filename: xmppRegister.xul - filename: xmpp-domain.patch - filename: xmpp-resource.patch - - filename: xmpp-onion-js.patch - - filename: xmpp-onion-xul.patch - - filename: xmpp-onion-locale.patch - filename: xmpp-username-split.patch - filename: version.patch - filename: branding/blistWindow.png

1 0

[tor-messenger-build/master] Do not set default servers for IRC and XMPP
by sukhbir＠torproject.org 29 Jun '15

29 Jun '15

commit 3fc2dd2d1aae96031c1bc9187b9b2b39047fae04 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jun 29 14:41:41 2015 -0400 Do not set default servers for IRC and XMPP --- projects/instantbird/irc.patch | 2 +- projects/instantbird/xmpp-username-split.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/instantbird/irc.patch b/projects/instantbird/irc.patch index d16c7cf..29632dd 100644 --- a/projects/instantbird/irc.patch +++ b/projects/instantbird/irc.patch @@ -7,7 +7,7 @@ index c581e2d..cf0d085 100644 usernameSplits: [ {get label() _("options.server"), separator: "@", - defaultValue: "chat.freenode.net", reverse: true} -+ defaultValue: "irc.oftc.net", reverse: true} ++ defaultValue: "", reverse: true} ], options: { diff --git a/projects/instantbird/xmpp-username-split.patch b/projects/instantbird/xmpp-username-split.patch index 2ecab9d..f551699 100644 --- a/projects/instantbird/xmpp-username-split.patch +++ b/projects/instantbird/xmpp-username-split.patch @@ -8,7 +8,7 @@ diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js + + usernameSplits: [ + {get label() _("options.domain"), separator: "@", -+ defaultValue: "jabber.org", reverse: true} ++ defaultValue: "", reverse: true} + ], + options: {

1 0