From c1efe1dfb255f155306952bd2320f56a807a5c01 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 26 Apr 2016 22:55:40 -0400
Subject: [bug] cast the identity to bytes

This fixes a bug in which the tls transport complains about receiving
unicode. It was only made evident by running against twisted 16.
---
 changes/next-changelog.rst | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'changes/next-changelog.rst')

diff --git a/changes/next-changelog.rst b/changes/next-changelog.rst
index 9b2a9d6..11389fe 100644
--- a/changes/next-changelog.rst
+++ b/changes/next-changelog.rst
@@ -1,4 +1,4 @@
-0.4.1 - xxx
+0.4.2 - xxx
 +++++++++++++++++++++++++++++++
 
 Please add lines to this file, they will be moved to the CHANGELOG.rst during
@@ -10,21 +10,12 @@ I've added a new category `Misc` so we can track doc/style/packaging stuff.
 
 Features
 ~~~~~~~~
-- `#7656 <https://leap.se/code/issues/7656>`_: Emit multi-user aware events.
-- `#4008 <https://leap.se/code/issues/4008>`_: Add token-based authentication to local IMAP/SMTP services.
-- `#7889 <https://leap.se/code/issues/7889>`_: Use cryptography instead of pycryptopp to reduce dependencies.
-- `#7263 <https://leap.se/code/issues/7263>`_: Implement local bounces to notify user of SMTP delivery errors.
-- Use twisted.cred to authenticate IMAP users.
-
 - `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
 - New feature without related issue number.
 
 Bugfixes
 ~~~~~~~~
-- `#7861 <https://leap.se/code/issues/7861>`_: Use the right succeed function for passthrough encrypted email.
-- `#7898 <https://leap.se/code/issues/7898>`_: Fix IMAP fetch headers
-- `#7977 <https://leap.se/code/issues/7977>`_: Decode attached keys so they are recognized by keymanager.
-- Fix the get_body logic for corner-cases in which body is None (yet-to-be synced docs, mainly).
+- Cast local identity (version string) to bytes, avoid TLS transport raising exception.
 
 - `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
 - Bugfix without related issue number.
-- 
cgit v1.2.3


From 3e33718164d91bb281c7d70b82c178a147f7cc39 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 11 May 2016 13:50:25 -0400
Subject: [bug] Allow pixelated integration not to interfere with thunderbird

One of the pixelated adaptors was trying to access a non-existing
attribute in HashableMailbox, which for some reason was blocking the
operation of the imap server (uncatched exception in listeners call
maybe).

adding an attribute skips this error and therefore allows seamless use
of both pixelated and thunderbird user agents at the same time.

Resolves: #8083
---
 changes/next-changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'changes/next-changelog.rst')

diff --git a/changes/next-changelog.rst b/changes/next-changelog.rst
index 11389fe..985e92a 100644
--- a/changes/next-changelog.rst
+++ b/changes/next-changelog.rst
@@ -15,6 +15,7 @@ Features
 
 Bugfixes
 ~~~~~~~~
+- `#8083 <https://leap.se/code/issues/8083>`_: Allow pixelated UA not interfere with Thunderbird operation.
 - Cast local identity (version string) to bytes, avoid TLS transport raising exception.
 
 - `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
-- 
cgit v1.2.3