October 2017 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Start bump to ESR 52.4.1
by arlo＠torproject.org 23 Oct '17

23 Oct '17

commit 659f95c8034530bdf5e1f1c5541ae348f55591cb Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Oct 23 11:16:12 2017 -0400 Start bump to ESR 52.4.1 --- ChangeLog | 4 ++-- .../instantbird/0001-Set-Tor-Messenger-preferences.patch | 13 ++++++------- .../0002-Trac-21634-Autologin-default-should-be-false.patch | 4 ++-- projects/instantbird/0003-XMPP-in-band-registration.patch | 4 ++-- projects/instantbird/0004-Remove-search-from-UI.patch | 4 ++-- projects/instantbird/0005-Add-Tor-Messenger-branding.patch | 4 ++-- ...0006-Remove-option-for-configuring-account-picture.patch | 4 ++-- .../instantbird/0007-Modify-top-protocol-defaults.patch | 4 ++-- projects/instantbird/0008-Modify-IRC-defaults.patch | 4 ++-- .../instantbird/0009-Do-not-set-default-XMPP-server.patch | 4 ++-- projects/instantbird/0010-Modify-themes.patch | 4 ++-- projects/instantbird/0011-Remove-logging-UI.patch | 4 ++-- projects/instantbird/0012-Cert-override.patch | 4 ++-- .../instantbird/0013-Display-all-traffic-over-Tor.patch | 4 ++-- projects/instantbird/0014-Trac-17480-Content-sink.patch | 4 ++-- .../instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 ++-- ...g-1321641-Use-built-in-functions-instead-of-an-svg.patch | 4 ++-- ...g-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch | 4 ++-- ...8-Trac-17517-Use-different-color-for-Add-Exception.patch | 4 ++-- ...019-Trac-21736-Hide-account-timestamp-from-message.patch | 6 +++--- ...date-allowed-duplicated-files-for-Windows-and-Linu.patch | 4 ++-- .../0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch | 4 ++-- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 4 ++-- .../mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 4 ++-- projects/mozilla/0002-Trac-16475-Block-flash-too.patch | 4 ++-- projects/mozilla/0003-OSX-package-as-tar.bz2.patch | 4 ++-- projects/mozilla/0004-Updater-fixups-for-TM.patch | 4 ++-- ...rmit-storing-exceptions-even-w-inPrivateBrowsingMo.patch | 4 ++-- projects/mozilla/config | 2 +- projects/tor-browser/config | 2 +- 30 files changed, 63 insertions(+), 64 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16921c1..113cebd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,8 @@ Tor Messenger 0.5.0b2 -- * All Platforms - * Use the tor-browser-52.4.0esr-7.0-1-build1 tag on tor-browser + * Use the tor-browser-52.4.1esr-7.0-1-build1 tag on tor-browser * Use the THUNDERBIRD_52_4_0_RELEASE tag on comm-esr52 - * Update tor-browser to 7.0.6 + * Update tor-browser to 7.0.7 * Update tor-browser-build to 9b4ba82 * Linux * Trac 23806: libotr.so and libgcrypt.so are using RPATH diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index a62853e..fe7b455 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,14 +1,14 @@ -From 1a419b902c5fc2d07e880fa13666fddf70100093 Mon Sep 17 00:00:00 2001 +From 530e8521e6172972a3e9c4d69865dd97e521ed34 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 14:30:41 -0400 Subject: [PATCH 01/22] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 468 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 444 insertions(+), 24 deletions(-) + im/app/profile/all-instantbird.js | 467 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 443 insertions(+), 24 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 127c86a662..3a5f63909e 100644 +index 127c86a662..68da4aaf28 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -1,3 +1,56 @@ @@ -198,7 +198,7 @@ index 127c86a662..3a5f63909e 100644 pref("chat.twitter.consumerKey", "TSuyS1ieRAkB3qWv8yyEw"); pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU"); -@@ -337,4 +387,374 @@ pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU +@@ -337,4 +387,373 @@ pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU pref("chat.prpls.forcePurple", ""); // Whether to parse log files for conversation statistics. @@ -255,7 +255,6 @@ index 127c86a662..3a5f63909e 100644 +pref("browser.privatebrowsing.autostart", true); +pref("browser.cache.disk.enable", false); +pref("browser.cache.offline.enable", false); -+pref("dom.indexedDB.enabled", false); +pref("permissions.memory_only", true); +pref("network.cookie.lifetimePolicy", 2); +pref("browser.download.manager.retention", 1); @@ -575,5 +574,5 @@ index 127c86a662..3a5f63909e 100644 +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); +#endif -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch index 79c7728..d9e0f09 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -1,4 +1,4 @@ -From 91062162469ca90684b78e420c8bb5e178de3b63 Mon Sep 17 00:00:00 2001 +From f76db2f793d280880541285dc7533a4e381083d9 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/22] Trac 21634: Autologin default should be false @@ -35,5 +35,5 @@ index d51df3225c..904d22ba57 100644 </wizard> -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index 68aaea8..b9f9110 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 249a20eedb778a0cd3917a6c414f5c1029d84051 Mon Sep 17 00:00:00 2001 +From 1e96ec6fad1e2b1b7d6699a0161936e2463ec9fc Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:09:40 -0400 Subject: [PATCH 03/22] XMPP in-band registration @@ -392,5 +392,5 @@ index 43d0f19e3f..c46fb2f956 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index 7ab2b82..1f864ef 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From bc892e8e51fb9d7a43d52f7a6a15fcbd3efee73b Mon Sep 17 00:00:00 2001 +From 91be0bc3c7093ad8823f0de71926a84057357a5f Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 04/22] Remove search from UI @@ -60,5 +60,5 @@ index fad67c190b..cfe2405ea3 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index f4cf2df..9a34620 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From f26c44cebb6b2b3d6300a91413b363c04fc3d74a Mon Sep 17 00:00:00 2001 +From 1a8e824e9b38bcedfa3f6e8255469dd1863edd74 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:46:51 -0400 Subject: [PATCH 05/22] Add Tor Messenger branding @@ -5121,5 +5121,5 @@ index 15ec569c11..4a2d35d8a1 100644 -Info=Instantbird is installing your updates and will start in a few moments… +Info=Tor Messenger is installing your updates and will start in a few moments… -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch index 6faad85..f910f34 100644 --- a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch +++ b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch @@ -1,4 +1,4 @@ -From 9ee2a5b30901e57d10faeb23a7fbea9ffc6ddbf1 Mon Sep 17 00:00:00 2001 +From fb13a8d6251ad6eb048f661f732ddec18b917626 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 06/22] Remove option for configuring account picture @@ -22,5 +22,5 @@ index 843f1eef57..71ee2c9ef8 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index c69f058..18750fa 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 1a168f96d38212aa4b7429abaa00954530e492cc Mon Sep 17 00:00:00 2001 +From 75f578f9833babab49cccdd5d6496754c8d0c94c Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 16:16:09 -0400 Subject: [PATCH 07/22] Modify top protocol defaults @@ -21,5 +21,5 @@ index 135b68386c..356321dbcc 100644 </hbox> </wizardpage> -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index 5ec0466..8c43f4f 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From bd964173ba0c6cca95de9c51baec230c7e40b1fb Mon Sep 17 00:00:00 2001 +From ef2faa5bfbc3166e03de603600254510b76402af Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 08/22] Modify IRC defaults @@ -61,5 +61,5 @@ index 43ed2ced4b..c2f16bee84 100644 ". Sending TIME response: \"" + now + "\"."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch index 85e32b4..421f02d 100644 --- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch +++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch @@ -1,4 +1,4 @@ -From f573a42e2d1ea02776edee2ade03e63bb6388e3a Mon Sep 17 00:00:00 2001 +From 48c971c3fcdd13fbd32783db0b1710f620d54d64 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri, 28 Jul 2017 12:11:57 -0400 Subject: [PATCH 09/22] Do not set default XMPP server @@ -21,5 +21,5 @@ index 2afb15f059..1d2c167d3e 100644 options: { -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index 0e2ad48..4b6449f 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From efabf635d682d4eea8a3329d71df014214d247ba Mon Sep 17 00:00:00 2001 +From 0effabf509de5abb22f355dacd17b325cbb39e23 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 10/22] Modify themes @@ -74,5 +74,5 @@ index 454e366960..18ba1f95cc 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 1f2aab4..88ce54f 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 371b52940173e9fd2fe85ac2ca5ef9f03d371e11 Mon Sep 17 00:00:00 2001 +From 390d4ce4ae7970d76f295ae25a9f04919a0efe01 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 11/22] Remove logging UI @@ -39,5 +39,5 @@ index 7c9db1cdd8..2d7b2701ea 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index d4370df..f87befc 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From 0774d5ed349bf900a96a9e13bcf9687c7d70368f Mon Sep 17 00:00:00 2001 +From 5e2b4241edebbf012e52dc1114dde5bb6320d0a9 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 12/22] Cert override @@ -60,5 +60,5 @@ index def78c809c..614d52bca2 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index c5e42ac..41e9293 100644 --- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From 7efeac31a408d2aa0b80597d2609897406469103 Mon Sep 17 00:00:00 2001 +From cb56ac3066fb156f05e689325de8efd01a7bca98 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 13/22] Display all traffic over Tor @@ -34,5 +34,5 @@ index c46fb2f956..6b49c84fad 100644 <!ENTITY accountProtocolShowMore.label "Show all protocols"> <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index 5b8632d..8bd4d61 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From c69ef4b466ab631fadfad9026c574bd036eedfba Mon Sep 17 00:00:00 2001 +From 1c29a80881d013c03bc0c4b0c4a3183b8068a847 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 14/22] Trac 17480: Content sink @@ -107,5 +107,5 @@ index 3b8ccfa2b3..ba41da76aa 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 01fca27..103470e 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From 94555d7b82f8bc5cf31446c574a1abc711838368 Mon Sep 17 00:00:00 2001 +From 9b8d29300d007b91dc38d3f7525de44dbf21a5fd Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE @@ -8915,5 +8915,5 @@ index bc25396873..e46815dfe3 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index 5e1b677..779bc11 100644 --- a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,4 +1,4 @@ -From e9d61cdc4d05ea2def1f270f8a7b5ea5dc520656 Mon Sep 17 00:00:00 2001 +From 6ebd41fb23aeb3a2821dabbfc5f68f22d146be00 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 29 Aug 2017 14:45:29 -0400 Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg @@ -53,5 +53,5 @@ index 80421b8ca2..6520757ddd 100644 .indicator { -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index 5b392f0..b489a60 100644 --- a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From ce279ac901dfdebc18a380a1011457f5c62f336c Mon Sep 17 00:00:00 2001 +From 6664ef2d7316926680b7086b60c5f9dfbd3644b6 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 26 Jul 2017 16:35:33 -0400 Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in @@ -48,5 +48,5 @@ index c52c8c637d..0069219fa6 100644 Components.interfaces.nsIWebProgress.NOTIFY_ALL); let url = request.url; -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch index 6d709c4..3f041db 100644 --- a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,4 +1,4 @@ -From 04752e3d48bf46acf925e2d7d160803ddd44995b Mon Sep 17 00:00:00 2001 +From ac3ab316aa809246e17d740582a9a0842795e80f Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Wed, 26 Jul 2017 16:38:19 -0400 Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception @@ -19,5 +19,5 @@ index 807184209b..8ce7f9ad81 100644 + color: #fff; +} -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch index cd8ef86..2926eef 100644 --- a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch +++ b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch @@ -1,4 +1,4 @@ -From ba99bf085d2243a42b3254ef6a72b0124fec89f6 Mon Sep 17 00:00:00 2001 +From 02f6b39fb7db8d1f8cd8bd0be52647fd0323d008 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Sun, 2 Apr 2017 13:07:09 -0400 Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message @@ -44,7 +44,7 @@ index a723d742bf..95d917f0d7 100644 } diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 3a5f63909e..7d7c97aa07 100644 +index 68da4aaf28..19334b382a 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -50,6 +50,11 @@ pref("extensions.systemAddon.update.url", ""); @@ -60,5 +60,5 @@ index 3a5f63909e..7d7c97aa07 100644 /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch index d218af0..d7bca7d 100644 --- a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch +++ b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch @@ -1,4 +1,4 @@ -From cb44d196feebe36434fdf433d3958835ef5358b6 Mon Sep 17 00:00:00 2001 +From 24ca6d8fb0750f0fb52c23a96ade0ed5a1d0bfa3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu, 27 Jul 2017 15:16:54 -0400 Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux @@ -94,5 +94,5 @@ index 988dc2d35a..940418bc9d 100644 # Variants of paths in mozilla/browser/installer/allowed-dupes.mn # and mail/installer/allowed-dupes.mn: -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch index 4787ec3..959c48c 100644 --- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch +++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch @@ -1,4 +1,4 @@ -From a95405607d17f87212af5b5584e28d32cf351873 Mon Sep 17 00:00:00 2001 +From 2bd322d66d462514bc4e3187e5faccd45f76f7aa Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 15 Aug 2017 16:40:33 -0400 Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers @@ -138,5 +138,5 @@ index efb0b77aee..05a4deb462 100644 + +onionAddress.label=%S is %S's onion address. -- -2.14.2 +2.14.3 diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 3ec3165..1dea7b5 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From 1c17e0cd088be7c374e4ef558482254fc9e19072 Mon Sep 17 00:00:00 2001 +From 1e357cc9e11b9929b430a150a3bbfb34fda9d503 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts @@ -166,5 +166,5 @@ index 6b49c84fad..de7fe8ed11 100644 <!ENTITY registerXMPP.label "Create this new account on the server"> +<!ENTITY tempXMPP.label "Create a temporary account automatically"> -- -2.14.2 +2.14.3 diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index dcee63f..adbeee3 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,4 +1,4 @@ -From 7c299eae2a3d81b1c48a3028ed2f16303f9c5e71 Mon Sep 17 00:00:00 2001 +From a48d843404cf7121f2c6d0902ae995d240377552 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Fri, 1 Sep 2017 17:39:04 -0400 Subject: [PATCH 1/5] Trac 19910: Prevents STARTTLS in XMPP @@ -115,5 +115,5 @@ index a21dfa4a5a11..5429637c1c3a 100644 void SetNamedPipeFD(PRFileDesc *fd) { mFD = fd; } -- -2.14.2 +2.14.3 diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index a4e21b3..4f95767 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,4 +1,4 @@ -From a7cfc17720295fb16c502fdbe5e368d8c7e986e5 Mon Sep 17 00:00:00 2001 +From 4fcd867d487ba1afa85bc77abd5558e71b16d3cf Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 6 Oct 2016 20:13:35 -0700 Subject: [PATCH 2/5] Trac 16475: Block flash too @@ -29,5 +29,5 @@ index cd1707beaf5f..d014832e0595 100644 } -- -2.14.2 +2.14.3 diff --git a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch index 5a9a877..149ffe8 100644 --- a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch @@ -1,4 +1,4 @@ -From 2dffef93c06fbe27a3cdb9ebd62510add4a9f870 Mon Sep 17 00:00:00 2001 +From 08a85b8e8de24bfe323831986a0821d8510b9f55 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm(a)torproject.org> Date: Thu, 25 Jun 2015 12:18:43 +0200 Subject: [PATCH 3/5] OSX: package as tar.bz2 @@ -21,5 +21,5 @@ index 51633178226c..64584f579390 100644 ifeq (,$(filter-out WINNT, $(OS_ARCH))) MOZ_PKG_FORMAT = ZIP -- -2.14.2 +2.14.3 diff --git a/projects/mozilla/0004-Updater-fixups-for-TM.patch b/projects/mozilla/0004-Updater-fixups-for-TM.patch index 4ab0770..a1a9105 100644 --- a/projects/mozilla/0004-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0004-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From 24a757cb2d69bcf88a095bec4b2636ed7297eae1 Mon Sep 17 00:00:00 2001 +From 9de45a092169f7cb4fa7fc67bbb304ac9d87bf2c Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Fri, 1 Sep 2017 17:45:40 -0400 Subject: [PATCH 4/5] Updater fixups for TM @@ -804,5 +804,5 @@ index c45961ac54e7..23d6fbe2929a 100644 nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); -- -2.14.2 +2.14.3 diff --git a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch index 38212fc..be75f90 100644 --- a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch +++ b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -1,4 +1,4 @@ -From 603166eaf0c7de988b52f5db9cdaa53bd6b60e0f Mon Sep 17 00:00:00 2001 +From 2545c1febc9aa88af07323732fb92186897026a5 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 5/5] Permit storing exceptions even w/ inPrivateBrowsingMode @@ -20,5 +20,5 @@ index 0ca24a614dca..df50701729ce 100644 + return false; // PrivateBrowsingUtils.isWindowPrivate(window); } -- -2.14.2 +2.14.3 diff --git a/projects/mozilla/config b/projects/mozilla/config index ff57dad..74bc34a 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: tor-browser-52.4.0esr-7.0-1-build1 +version: tor-browser-52.4.1esr-7.0-1-build1 filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/tor-browser.git git_hash: '[% c("version") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index fb92e8e..f4cb8f4 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 7.0.6 +version: 7.0.7 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0

[tor-messenger-build/master] Enable content process sandbox on Windows
by arlo＠torproject.org 23 Oct '17

23 Oct '17

commit 4b91bfe6b84b508ae80538e12593bceaffe842c4 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Oct 23 10:58:40 2017 -0400 Enable content process sandbox on Windows --- ChangeLog | 2 ++ projects/instantbird/mozconfig-windows-i686 | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c34e3f..16921c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ Tor Messenger 0.5.0b2 -- * Trac 23542: Add snowflake pt * Mac * Trac 23542: Add snowflake pt + * Windows + * Trac 16010: Enable the content process sandbox on Windows Tor Messenger 0.5.0b1 -- September 28, 2017 * All Platforms diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index f8e335d..bca7c2c 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -7,7 +7,3 @@ ac_add_options --with-toolchain-prefix=i686-w64-mingw32- ac_add_options --enable-default-toolkit=cairo-windows ac_add_options --enable-strip - -# We can't build the sandbox code with mingw-w64: -# https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 -ac_add_options --disable-sandbox

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Oct '17

23 Oct '17

commit 211e1b9266b0ae3b9d8a3ccf46c720a3bc06e167 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 23 14:46:05 2017 +0000 Update translations for liveusb-creator --- nn/nn.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/nn/nn.po b/nn/nn.po index abc268b03..cbc3dfc09 100644 --- a/nn/nn.po +++ b/nn/nn.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Bjørn I. <bjorn.svindseth(a)online.no>, 2014,2016 +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014,2016-2017 # Finn Brudal <finnbrudal(a)yahoo.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-20 18:02+0200\n" -"PO-Revision-Date: 2017-09-21 01:33+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-09-25 14:02+0200\n" +"PO-Revision-Date: 2017-10-23 14:41+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -126,7 +126,7 @@ msgstr "Ustøtta filsystem: %s" #: ../tails_installer/creator.py:788 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" -msgstr "" +msgstr "Ukjend GLib-unnatak under freistnad på montering av: %(message)s" #: ../tails_installer/creator.py:792 #, python-format @@ -192,7 +192,7 @@ msgstr "Installerer støvellastar..." #: ../tails_installer/creator.py:1043 #, python-format msgid "Could not find the '%s' COM32 module" -msgstr "" +msgstr "Klarte ikkje å finne '%s' COM32-modulen" #: ../tails_installer/creator.py:1051 ../tails_installer/creator.py:1432 #, python-format @@ -215,17 +215,17 @@ msgstr "Formaterer %(device)s som FAT32" #: ../tails_installer/creator.py:1266 msgid "Could not find syslinux' gptmbr.bin" -msgstr "" +msgstr "Klarte ikkje å finne syslinux' gptmbr.bin" #: ../tails_installer/creator.py:1279 #, python-format msgid "Reading extracted MBR from %s" -msgstr "" +msgstr "Les utpakka MBR frå %s" #: ../tails_installer/creator.py:1283 #, python-format msgid "Could not read the extracted MBR from %(path)s" -msgstr "" +msgstr "Klarte ikkje å lese utpakka MBR frå %(path)s" #: ../tails_installer/creator.py:1296 ../tails_installer/creator.py:1297 #, python-format @@ -318,24 +318,24 @@ msgstr "" #: ../tails_installer/gui.py:454 msgid "Upgrade" -msgstr "" +msgstr "Oppgrader" #: ../tails_installer/gui.py:458 ../data/tails-installer.ui.h:7 msgid "Install" -msgstr "" +msgstr "Installer" #: ../tails_installer/gui.py:465 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(size)s %(vendor)s %(model)s eining (%(device)s)" #: ../tails_installer/gui.py:476 msgid "No ISO image selected" -msgstr "" +msgstr "ISO bilde ikkje valt" #: ../tails_installer/gui.py:477 msgid "Please select a Tails ISO image." -msgstr "" +msgstr "Vel eit Tails ISO-bilde." #: ../tails_installer/gui.py:516 msgid "No device suitable to install Tails could be found" @@ -379,7 +379,7 @@ msgstr "Installering fullførd" #: ../tails_installer/gui.py:644 msgid "Installation was completed." -msgstr "" +msgstr "Installeringa fullført." #: ../tails_installer/gui.py:693 msgid "Unable to mount device" @@ -492,7 +492,7 @@ msgstr "" #: ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" -msgstr "" +msgstr "Klon gjeldande Tails" #: ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" @@ -508,4 +508,4 @@ msgstr "" #: ../data/tails-installer.ui.h:6 msgid "Reinstall (delete all data)" -msgstr "" +msgstr "Installer på nytt (slett alle dataa)"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 23 Oct '17

23 Oct '17

commit 477c06550a3d2e1c6a190e3a92710bc5be739dc0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 23 14:45:58 2017 +0000 Update translations for https_everywhere_completed --- nn/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd index a8829b394..e62f9a886 100644 --- a/nn/https-everywhere.dtd +++ b/nn/https-everywhere.dtd @@ -11,6 +11,7 @@ <!ENTITY https-everywhere.menu.showCounter "Vis teljar"> <!ENTITY https-everywhere.menu.viewAllRules "Vis alle reglane"> +<!ENTITY https-everywhere.options.generalSettings "Generelle innstillingar"> <!ENTITY https-everywhere.options.importSettings "Importer innstillingar"> <!ENTITY https-everywhere.options.import "Importer"> <!ENTITY https-everywhere.options.imported "Innstillingane dine er importerte">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 23 Oct '17

23 Oct '17

commit 82f156db2937890c94c6ce2ad5f00c8e5aecac7e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 23 14:45:46 2017 +0000 Update translations for https_everywhere --- nn/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd index 2e1e2d9e6..e62f9a886 100644 --- a/nn/https-everywhere.dtd +++ b/nn/https-everywhere.dtd @@ -11,7 +11,7 @@ <!ENTITY https-everywhere.menu.showCounter "Vis teljar"> <!ENTITY https-everywhere.menu.viewAllRules "Vis alle reglane"> -<!ENTITY https-everywhere.options.generalSettings "General Settings"> +<!ENTITY https-everywhere.options.generalSettings "Generelle innstillingar"> <!ENTITY https-everywhere.options.importSettings "Importer innstillingar"> <!ENTITY https-everywhere.options.import "Importer"> <!ENTITY https-everywhere.options.imported "Innstillingane dine er importerte">

1 0

[tor-messenger-build/master] Bump tor-browser-build to 9b4ba82
by arlo＠torproject.org 23 Oct '17

23 Oct '17

commit 4ff1d64dc1f9ae732978d319987bb7e7f3aed010 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Oct 23 10:33:46 2017 -0400 Bump tor-browser-build to 9b4ba82 --- ChangeLog | 4 ++-- projects/instantbird/mozconfig-osx-x86_64 | 3 ++- rbm.conf | 2 +- tor-browser-build | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb9d4ce..7c34e3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,9 @@ -Tor Messenger 0.5.0b2 -- +Tor Messenger 0.5.0b2 -- * All Platforms * Use the tor-browser-52.4.0esr-7.0-1-build1 tag on tor-browser * Use the THUNDERBIRD_52_4_0_RELEASE tag on comm-esr52 * Update tor-browser to 7.0.6 - * Update tor-browser-build to 8c4c05d + * Update tor-browser-build to 9b4ba82 * Linux * Trac 23806: libotr.so and libgcrypt.so are using RPATH * Trac 23542: Add snowflake pt diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64 index 21154f5..cd1c4ef 100644 --- a/projects/instantbird/mozconfig-osx-x86_64 +++ b/projects/instantbird/mozconfig-osx-x86_64 @@ -5,7 +5,8 @@ TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks -FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" +HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" +FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS" diff --git a/rbm.conf b/rbm.conf index 5f793b2..e5938e4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -310,7 +310,7 @@ ENV: # We will need to update this when there is a new spec version available runc_spec100 => sub { my ($out) = capture_exec('sudo', 'runc', '--version'); - return $out =~ m/^runc version spec: 1\.0\.0$/; + return $out =~ m/^spec: 1\.0\.0$/m; }, }, ) diff --git a/tor-browser-build b/tor-browser-build index 8c4c05d..9b4ba82 160000 --- a/tor-browser-build +++ b/tor-browser-build @@ -1 +1 @@ -Subproject commit 8c4c05ddcfc30107b967b204d491523685460226 +Subproject commit 9b4ba8252a80fb10ca9fc22e90033d63383ac05d

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 8b8d501040946bb2280a9640f91a55b7f17b03e3 Merge: 6a7aa4735 af33fdd7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:22:43 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9

1 0

[tor/maint-0.3.2] Remove the length limit from write_http_status_line
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit af33fdd7c1860399fe8d6861c163e5d64b0292b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:21:22 2017 -0400 Remove the length limit from write_http_status_line Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin failure message really long. Backport from 0.3.2's 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d, where arma said "get rid of the scary 256-byte-buf landmine". --- changes/bug23908 | 3 +++ src/or/directory.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/changes/bug23908 b/changes/bug23908 new file mode 100644 index 000000000..f641b66bb --- /dev/null +++ b/changes/bug23908 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha): + - Remove the length limit on HTTP status lines that authorities can send + in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc. diff --git a/src/or/directory.c b/src/or/directory.c index 45fbd1dd3..bef65d349 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3282,14 +3282,12 @@ static void write_http_status_line(dir_connection_t *conn, int status, const char *reason_phrase) { - char buf[256]; - if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n", - status, reason_phrase ? reason_phrase : "OK") < 0) { - log_warn(LD_BUG,"status line too long."); - return; - } + char *buf = NULL; + tor_asprintf(&buf, "HTTP/1.0 %d %s\r\n\r\n", + status, reason_phrase ? reason_phrase : "OK"); log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase); connection_write_to_buf(buf, strlen(buf), TO_CONN(conn)); + tor_free(buf); } /** Write the header for an HTTP/1.0 response onto <b>conn</b>-\>outbuf,

1 0

[tor/master] Remove the length limit from write_http_status_line
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit af33fdd7c1860399fe8d6861c163e5d64b0292b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:21:22 2017 -0400 Remove the length limit from write_http_status_line Fixes bug 23908; bugfix on 0.3.1.6-rc when we made the keypin failure message really long. Backport from 0.3.2's 771fb7e7baa789c55ba15c4c26c8a4889ff9fe8d, where arma said "get rid of the scary 256-byte-buf landmine". --- changes/bug23908 | 3 +++ src/or/directory.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/changes/bug23908 b/changes/bug23908 new file mode 100644 index 000000000..f641b66bb --- /dev/null +++ b/changes/bug23908 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory authority, backport from 0.3.2.1-alpha): + - Remove the length limit on HTTP status lines that authorities can send + in their replies. Fixes bug 23499; bugfix on 0.3.1.6-rc. diff --git a/src/or/directory.c b/src/or/directory.c index 45fbd1dd3..bef65d349 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3282,14 +3282,12 @@ static void write_http_status_line(dir_connection_t *conn, int status, const char *reason_phrase) { - char buf[256]; - if (tor_snprintf(buf, sizeof(buf), "HTTP/1.0 %d %s\r\n\r\n", - status, reason_phrase ? reason_phrase : "OK") < 0) { - log_warn(LD_BUG,"status line too long."); - return; - } + char *buf = NULL; + tor_asprintf(&buf, "HTTP/1.0 %d %s\r\n\r\n", + status, reason_phrase ? reason_phrase : "OK"); log_debug(LD_DIRSERV,"Wrote status 'HTTP/1.0 %d %s'", status, reason_phrase); connection_write_to_buf(buf, strlen(buf), TO_CONN(conn)); + tor_free(buf); } /** Write the header for an HTTP/1.0 response onto <b>conn</b>-\>outbuf,

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 8b8d501040946bb2280a9640f91a55b7f17b03e3 Merge: 6a7aa4735 af33fdd7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:22:43 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9

1 0