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

[tor-messenger-build/master] Display plaintext in notifications
by arlo＠torproject.org 26 May '16

26 May '16

commit 2e42cdb764e54eb383a780ffc08d43ba547fbb45 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu May 26 10:06:43 2016 -0700 Display plaintext in notifications * Trac 19053 --- ChangeLog | 1 + projects/instantbird/config | 1 + projects/instantbird/trac-19053.patch | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2ea3727..aa38690 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Tor Messenger 0.1.0b7 -- * All Platforms * Use the THUNDERBIRD_45_1_0_RELEASE tag on mozilla-esr45 * Use the THUNDERBIRD_45_1_0_RELEASE tag on comm-esr45 + * Bug 19053: Display plaintext in notifications * ctypes-otr * GH 66: Provide functionality for adding verified fingerprints (patch by Vu Quoc Huy) diff --git a/projects/instantbird/config b/projects/instantbird/config index 9215a98..32306e6 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -73,6 +73,7 @@ input_files: - filename: trac-17896.patch - filename: trac-17494.patch - filename: trac-13312.patch + - filename: trac-19053.patch - filename: version.patch - filename: search-context-menu.patch - filename: search-preferences-xul.patch diff --git a/projects/instantbird/trac-19053.patch b/projects/instantbird/trac-19053.patch new file mode 100644 index 0000000..e4267da --- /dev/null +++ b/projects/instantbird/trac-19053.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1464281776 25200 +# Thu May 26 09:56:16 2016 -0700 +# Node ID f7624aac9022c38cfec6b2bc4f73ad69a5cf2a04 +# Parent 664eff8ea96f4bb2c15aa3ff01fd7c33e5cc3480 +Notification should use message prepared for dislaying + +diff --git a/im/modules/ibNotifications.jsm b/im/modules/ibNotifications.jsm +--- a/im/modules/ibNotifications.jsm ++++ b/im/modules/ibNotifications.jsm +@@ -20,17 +20,17 @@ var Notifications = { + } catch (e) { } + return ellipsis; + }, + + _showMessageNotification: function (aMessage) { + // Put the message content into a div node of the hidden HTML window. + let doc = getHiddenHTMLWindow().document; + let xhtmlElement = doc.createElementNS("http://www.w3.org/1999/xhtml", "div"); +- xhtmlElement.innerHTML = aMessage.message.replace(/<br>/gi, "<br/>"); ++ xhtmlElement.innerHTML = aMessage.displayMessage.replace(/<br>/gi, "<br/>"); + + // Convert the div node content to plain text. + let encoder = + Components.classes["@mozilla.org/layout/documentEncoder;1?type=text/plain"] + .createInstance(Components.interfaces.nsIDocumentEncoder); + encoder.init(doc, "text/plain", 0); + encoder.setNode(xhtmlElement); + let messageText = encoder.encodeToString().replace(/\s+/g, " ");

1 0

[tor/master] Bump to 0.2.8.3-alpha
by nickm＠torproject.org 26 May '16

26 May '16

commit 0a74346fe48d732b6fbc05676331c842d2c0be10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 26 12:12:38 2016 -0400 Bump to 0.2.8.3-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 59433c2..28210c1 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.2-alpha-dev]) +AC_INIT([tor],[0.2.8.3-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 1ddec0e..8efc855 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.2-alpha-dev" +!define VERSION "0.2.8.3-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 67d023d..97f0c8c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.2-alpha-dev" +#define VERSION "0.2.8.3-alpha"

1 0

[tor/maint-0.2.8] Bump to 0.2.8.3-alpha
by nickm＠torproject.org 26 May '16

26 May '16

commit 0a74346fe48d732b6fbc05676331c842d2c0be10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 26 12:12:38 2016 -0400 Bump to 0.2.8.3-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 59433c2..28210c1 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.2-alpha-dev]) +AC_INIT([tor],[0.2.8.3-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 1ddec0e..8efc855 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.2-alpha-dev" +!define VERSION "0.2.8.3-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 67d023d..97f0c8c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.2-alpha-dev" +#define VERSION "0.2.8.3-alpha"

1 0

[tor/release-0.2.8] Bump to 0.2.8.3-alpha
by nickm＠torproject.org 26 May '16

26 May '16

commit 0a74346fe48d732b6fbc05676331c842d2c0be10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 26 12:12:38 2016 -0400 Bump to 0.2.8.3-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 59433c2..28210c1 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.2-alpha-dev]) +AC_INIT([tor],[0.2.8.3-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 1ddec0e..8efc855 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.2-alpha-dev" +!define VERSION "0.2.8.3-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 67d023d..97f0c8c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.2-alpha-dev" +#define VERSION "0.2.8.3-alpha"

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 26 May '16

26 May '16

commit a38dfc7f29392b919c1a1d9ddb6075eec311d9c3 Merge: 8c1c71a 0a74346 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 26 12:30:03 2016 -0400 Merge branch 'maint-0.2.8' (Ours merge, to avoid taking version bump)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 26 May '16

26 May '16

commit c90f808ebc3af50d6408e6c1d8eed819536263e7 Merge: fc4a3b3 0a74346 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 26 12:29:51 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 26 May '16

26 May '16

commit 8c1c71aa2c941d7defd8874f49e541b0f185f6b3 Merge: b7fac18 a873ba8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 26 12:12:54 2016 -0400 Merge branch 'maint-0.2.8' src/or/router.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.8] Fold one more item into 0.2.8 changelog; hope it will be today?
by nickm＠torproject.org 26 May '16

26 May '16

commit b28acba3c38c517a3fcb0fe36cc807312f72fe97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 26 12:10:26 2016 -0400 Fold one more item into 0.2.8 changelog; hope it will be today? --- ChangeLog | 4 +++- changes/bug18668 | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04794e5..768ebb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.8.3-alpha - 2016-05-2? +Changes in version 0.2.8.3-alpha - 2016-05-26 Tor 0.2.8.3-alpha resolves several bugs, most of them introduced over the course of the 0.2.8 development cycle. It improves the behavior of directory clients, fixes several crash bugs, fixes a gap in compiler @@ -63,6 +63,8 @@ Changes in version 0.2.8.3-alpha - 2016-05-2? o Major bugfixes (testing): - Fix a bug that would block 'make test-network-all' on systems where IPv6 packets were lost. Fixes bug 19008; bugfix on tor-0.2.7.3-rc. + - Avoid "WSANOTINITIALISED" warnings in the unit tests. Fixes bug 18668; + bugfix on 0.2.8.1-alpha. o Minor features (clients): - Make clients, onion services, and bridge relays always use an diff --git a/changes/bug18668 b/changes/bug18668 deleted file mode 100644 index 4b186b5..0000000 --- a/changes/bug18668 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (tests): - - Avoid "WSANOTINITIALISED" warnings in the unit tests. Fixes bug 18668; - bugfix on 0.2.8.1-alpha.

1 0

[tor/release-0.2.8] Fix two long lines
by nickm＠torproject.org 26 May '16

26 May '16

commit a873ba8edda40e4bc43e887d5f46a50eebb8b2ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 26 12:11:57 2016 -0400 Fix two long lines --- src/or/router.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index aa4acf6..01316c1 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2129,7 +2129,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) ei->cache_info.is_extrainfo = 1; strlcpy(ei->nickname, get_options()->Nickname, sizeof(ei->nickname)); ei->cache_info.published_on = ri->cache_info.published_on; - ei->cache_info.signing_key_cert = tor_cert_dup(get_master_signing_key_cert()); + ei->cache_info.signing_key_cert = + tor_cert_dup(get_master_signing_key_cert()); memcpy(ei->cache_info.identity_digest, ri->cache_info.identity_digest, DIGEST_LEN); @@ -2197,8 +2198,9 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) ri->cache_info.signed_descriptor_digest); if (ei) { - tor_assert(! routerinfo_incompatible_with_extrainfo(ri->identity_pkey, ei, - &ri->cache_info, NULL)); + tor_assert(! + routerinfo_incompatible_with_extrainfo(ri->identity_pkey, ei, + &ri->cache_info, NULL)); } *r = ri;

1 0

[tor/release-0.2.8] Bump to 0.2.8.3-alpha
by nickm＠torproject.org 26 May '16

26 May '16

commit cd12ee6740a5495e5edf5ecfc7f457b1bad2efb2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 26 12:12:38 2016 -0400 Bump to 0.2.8.3-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 59433c2..28210c1 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.2-alpha-dev]) +AC_INIT([tor],[0.2.8.3-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 1ddec0e..8efc855 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.2-alpha-dev" +!define VERSION "0.2.8.3-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 67d023d..97f0c8c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.2-alpha-dev" +#define VERSION "0.2.8.3-alpha"

1 0