Fold in changes.

19 files changed, 30 insertions, 28 deletions

diff --git a/CHANGELOG b/CHANGELOG
index e94943ae..15db6cd2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,33 @@
+0.3.3 Sep 20 -- "the calm after the tempest" release:
+  o Remove execution bits in text files in bundle. Closes #3617.
+  o Use generic bad username/password message instead of specific ones when
+    the user uses incorrect data during login. Closes #3656.
+  o Fix LoggerWindow saving more than one line return per line in the logs
+    file. Closes #3714.
+  o Fix keyring imports so we do not get import errors. Closes: #3759
+  o Catch logout problem, display a user message and allow log back in after a
+    successful logout if there was a logout error before. Closes #3774.
+  o Fix path prefix helper for the bundle and add regresion tests. Closes #3778.
+  o Prevent dialogs closing the app when it has been minimized to the tray. Closes #3791.
+  o Do not try to install resolv-update globally. Closes: #3803
+  o Inconsistent hide/show main window from tray action. Closes #3821.
+  o Allow SMTP to start even when provider does not offer EIP. Closes: #3847
+  o Fix username case problem at register/login. Closes #3857.
+  o Catch IndexError on `first` utility.
+  o Update git repo name in docs. Closes: #3417
+  o Move STANDALONE flag to a module and unify get_path_prefix queries.
+    Closes #3636.
+  o Display the Encrypted Internet and Encrypted Email status in the systray
+    tooltip. Closes #3758.
+  o Tasktray menu changes, closes #3792.
+    - Remove the provider domain item (e.g. bitmask.net).
+    - Rename the EIP status menu items to be more descriptive.
+    - Change the EIP status menu items from disabled menu items
+      to submenus with children.
+    - Move the EIP action menu items under the EIP status submenu tree.
+  o Adds --version flag. Closes: #3816
+  o Refactors EIPConnection to use LEAPConnection state machine. Closes: #3900
+
 0.3.2 Sep 6 -- the "no crashes or anything" release:
   o Fix up script in non-bundle linuces. Closes: #3450
   o Logout stops imap and smtp services. Closes: #3553
diff --git a/changes/bug-3617_remove-exec-bits-from-text-in-bundle b/changes/bug-3617_remove-exec-bits-from-text-in-bundle
deleted file mode 100644
index caf3a62e..00000000
--- a/changes/bug-3617_remove-exec-bits-from-text-in-bundle
+++ /dev/null
@@ -1 +0,0 @@
-  o Remove execution bits in text files in bundle. Closes #3617.
diff --git a/changes/bug-3656_generic-username-password-message b/changes/bug-3656_generic-username-password-message
deleted file mode 100644
index 8e6e3e2f..00000000
--- a/changes/bug-3656_generic-username-password-message
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Use generic bad username/password message instead of specific ones when
-    the user uses incorrect data during login. Closes #3656.
diff --git a/changes/bug-3714_fix-logger-saving-several-line-returns b/changes/bug-3714_fix-logger-saving-several-line-returns
deleted file mode 100644
index 455c5a95..00000000
--- a/changes/bug-3714_fix-logger-saving-several-line-returns
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Fix LoggerWindow saving more than one line return per line in the logs
-    file. Closes #3714.
diff --git a/changes/bug-3774_fix-logout-error b/changes/bug-3774_fix-logout-error
deleted file mode 100644
index ce0951f0..00000000
--- a/changes/bug-3774_fix-logout-error
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Catch logout problem, display a user message and allow log back in after a
-    successful logout if there was a logout error before. Closes #3774.
diff --git a/changes/bug-3778_fix-path-prefix-helper b/changes/bug-3778_fix-path-prefix-helper
deleted file mode 100644
index e7cec539..00000000
--- a/changes/bug-3778_fix-path-prefix-helper
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix path prefix helper for the bundle and add regresion tests. Closes #3778.
diff --git a/changes/bug-3791_prevent-last-window-close-app b/changes/bug-3791_prevent-last-window-close-app
deleted file mode 100644
index 3eeee72a..00000000
--- a/changes/bug-3791_prevent-last-window-close-app
+++ /dev/null
@@ -1 +0,0 @@
-  o Prevent dialogs closing the app when it has been minimized to the tray. Closes #3791.
diff --git a/changes/bug-3821_inconsistent-hide-show-mainwindow b/changes/bug-3821_inconsistent-hide-show-mainwindow
deleted file mode 100644
index 3fb05a85..00000000
--- a/changes/bug-3821_inconsistent-hide-show-mainwindow
+++ /dev/null
@@ -1 +0,0 @@
-  o Inconsistent hide/show main window from tray action. Closes #3821.
diff --git a/changes/bug-3847-start-smtp-without-eip b/changes/bug-3847-start-smtp-without-eip
deleted file mode 100644
index 5ed959a4..00000000
--- a/changes/bug-3847-start-smtp-without-eip
+++ /dev/null
@@ -1 +0,0 @@
-  o Allow SMTP to start even when provider does not offer EIP. Closes: #3847
diff --git a/changes/bug-3857_username-case-problem b/changes/bug-3857_username-case-problem
deleted file mode 100644
index 3b8ef7b2..00000000
--- a/changes/bug-3857_username-case-problem
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix username case problem at register/login. Closes #3857.
diff --git a/changes/bug_3759-fix-keyring-imports b/changes/bug_3759-fix-keyring-imports
deleted file mode 100644
index ed489633..00000000
--- a/changes/bug_3759-fix-keyring-imports
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix keyring imports so we do not get import errors. Closes: #3759
diff --git a/changes/bug_3803-do-not-install-resolv-update-globally b/changes/bug_3803-do-not-install-resolv-update-globally
deleted file mode 100644
index f6e06d5f..00000000
--- a/changes/bug_3803-do-not-install-resolv-update-globally
+++ /dev/null
@@ -1 +0,0 @@
-  o Do not try to install resolv-update globally. Closes: #3803
diff --git a/changes/bug_fix-first b/changes/bug_fix-first
deleted file mode 100644
index 0ef5188c..00000000
--- a/changes/bug_fix-first
+++ /dev/null
@@ -1 +0,0 @@
-  o Catch IndexError on `first` utility.
diff --git a/changes/feature-3636_standalone-flag-to-module b/changes/feature-3636_standalone-flag-to-module
deleted file mode 100644
index caf16b1a..00000000
--- a/changes/feature-3636_standalone-flag-to-module
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Move STANDALONE flag to a module and unify get_path_prefix queries.
-    Closes #3636.
diff --git a/changes/feature-3758_show-eip-and-mx-status-in-systray-tooltip b/changes/feature-3758_show-eip-and-mx-status-in-systray-tooltip
deleted file mode 100644
index edbb3ea0..00000000
--- a/changes/feature-3758_show-eip-and-mx-status-in-systray-tooltip
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Display the Encrypted Internet and Encrypted Email status in the systray
-    tooltip. Closes #3758.
diff --git a/changes/feature-3792_systray-improvements b/changes/feature-3792_systray-improvements
deleted file mode 100644
index e10a29c2..00000000
--- a/changes/feature-3792_systray-improvements
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Tasktray menu changes, closes #3792.
-    - Remove the provider domain item (e.g. bitmask.net).
-    - Rename the EIP status menu items to be more descriptive.
-    - Change the EIP status menu items from disabled menu items
-      to submenus with children.
-    - Move the EIP action menu items under the EIP status submenu tree.
diff --git a/changes/feature_3417_update-repo-in-docs b/changes/feature_3417_update-repo-in-docs
deleted file mode 100644
index 065b9497..00000000
--- a/changes/feature_3417_update-repo-in-docs
+++ /dev/null
@@ -1 +0,0 @@
-  o Update git repo name in docs. Closes: #3417
diff --git a/changes/feature_3816-add-version-flag b/changes/feature_3816-add-version-flag
deleted file mode 100644
index cfbd2f67..00000000
--- a/changes/feature_3816-add-version-flag
+++ /dev/null
@@ -1 +0,0 @@
-  o Adds --version flag. Closes: #3816
diff --git a/changes/feature_3900-eip-state-machine b/changes/feature_3900-eip-state-machine
deleted file mode 100644
index 63aad3d3..00000000
--- a/changes/feature_3900-eip-state-machine
+++ /dev/null
@@ -1 +0,0 @@
-  o Refactors EIPConnection to use LEAPConnection state machine. Closes: #3900