Fold in changes

15 files changed, 23 insertions, 20 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e9740e4a..09ea992e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,29 @@
 History
 -------
 
+0.3.6 Nov 1 -- the "bạn có thể đọc này?" release:
+- Fix problem changing a non-ascii password. Closes #4003.
+- Enable password change in the client only if it has started the
+  correct services. Closes #4093.
+- Select the current logged in provider in the preferences
+  window. Closes #4117.
+- Fix problem with non-ascii paths. Closes #4189.
+- Capture soledad boostrap errors after latest soledad changes.
+- Refactor keyring handling and make it properly save user and
+  password. Fixes #4190.
+- Properly stop the imap daemon at logout. Fixes #4199.
+- Align left the speed and transferred displays for EIP. Fixes #4204.
+- Remove autostart eip option from settings panel, rely on last used
+  setting. Closes #4132.
+- Add support for requests 1.1.0 (raring). Closes: #4308
+- Refactor mail connections to use state machine. Closes: #4059
+- Add a command to setup.py to freeze the versions reported under
+  debian branches. Closes: #4315
+- Use coloredlogs handler if present (for development, not a
+  requirement).
+- Hide the GUI for services that are not supported on the set of
+  configured providers. Closes #4170.
+
 0.3.5 Oct 18 -- the "I can stand on one foot" release:
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
diff --git a/changes/bug-4003_fix-non-ascii-password-change b/changes/bug-4003_fix-non-ascii-password-change
deleted file mode 100644
index 58de5078..00000000
--- a/changes/bug-4003_fix-non-ascii-password-change
+++ /dev/null
@@ -1 +0,0 @@
-- Fix problem changing a non-ascii password. Closes #4003.
diff --git a/changes/bug-4093_change-password-policy b/changes/bug-4093_change-password-policy
deleted file mode 100644
index 87f6fd15..00000000
--- a/changes/bug-4093_change-password-policy
+++ /dev/null
@@ -1,2 +0,0 @@
-  - Enable password change in the client only if it has started the correct
-    services. Closes #4093.
diff --git a/changes/bug-4117_select-current-logged-in-provider-in-preferences-window b/changes/bug-4117_select-current-logged-in-provider-in-preferences-window
deleted file mode 100644
index 46a031e0..00000000
--- a/changes/bug-4117_select-current-logged-in-provider-in-preferences-window
+++ /dev/null
@@ -1,2 +0,0 @@
-  - Select the current logged in provider in the preferences window. Closes
-    #4117.
diff --git a/changes/bug-4189_non-ascii-path-problem b/changes/bug-4189_non-ascii-path-problem
deleted file mode 100644
index e8b43e40..00000000
--- a/changes/bug-4189_non-ascii-path-problem
+++ /dev/null
@@ -1 +0,0 @@
-- Fix problem with non-ascii paths. Closes #4189.
diff --git a/changes/bug-improvie-error-handling b/changes/bug-improvie-error-handling
deleted file mode 100644
index 405dd771..00000000
--- a/changes/bug-improvie-error-handling
+++ /dev/null
@@ -1 +0,0 @@
-- Capture soledad boostrap errors after latest soledad changes.
diff --git a/changes/bug_fix_keyring_save b/changes/bug_fix_keyring_save
deleted file mode 100644
index 64bb82a9..00000000
--- a/changes/bug_fix_keyring_save
+++ /dev/null
@@ -1,2 +0,0 @@
-- Refactor keyring handling and make it properly save user and
-  password. Fixes #4190.
diff --git a/changes/bug_properly_stop_imap b/changes/bug_properly_stop_imap
deleted file mode 100644
index f2942bad..00000000
--- a/changes/bug_properly_stop_imap
+++ /dev/null
@@ -1 +0,0 @@
-- Properly stop the imap daemon at logout. Fixes #4199.
\ No newline at end of file
diff --git a/changes/bug_tighter_clustering_eip_meter b/changes/bug_tighter_clustering_eip_meter
deleted file mode 100644
index dca8f2cd..00000000
--- a/changes/bug_tighter_clustering_eip_meter
+++ /dev/null
@@ -1,2 +0,0 @@
-- Align left the speed and transferred displays for EIP. Fixes
-  #4204.
diff --git a/changes/feature-4132_remove-autostart-eip-setting b/changes/feature-4132_remove-autostart-eip-setting
deleted file mode 100644
index f95e4125..00000000
--- a/changes/feature-4132_remove-autostart-eip-setting
+++ /dev/null
@@ -1,2 +0,0 @@
-- Remove autostart eip option from settings panel, rely on last used
-  setting. Closes #4132.
diff --git a/changes/feature-4308-pin-requests-dep b/changes/feature-4308-pin-requests-dep
deleted file mode 100644
index 1f7af6ca..00000000
--- a/changes/feature-4308-pin-requests-dep
+++ /dev/null
@@ -1 +0,0 @@
-- Add support for requests 1.1.0 (raring). Closes: #4308
diff --git a/changes/feature_4059-mail-state-refactor b/changes/feature_4059-mail-state-refactor
deleted file mode 100644
index 2e3f5056..00000000
--- a/changes/feature_4059-mail-state-refactor
+++ /dev/null
@@ -1 +0,0 @@
-- Refactor mail connections to use state machine. Closes: #4059
diff --git a/changes/feature_4315-freeze-debianver-command b/changes/feature_4315-freeze-debianver-command
deleted file mode 100644
index 0ae8ad97..00000000
--- a/changes/feature_4315-freeze-debianver-command
+++ /dev/null
@@ -1 +0,0 @@
-- Add a command to setup.py to freeze the versions reported under debian branches. Closes: #4315
diff --git a/changes/feature_colored-logs b/changes/feature_colored-logs
deleted file mode 100644
index b28a38bd..00000000
--- a/changes/feature_colored-logs
+++ /dev/null
@@ -1 +0,0 @@
-- Use coloredlogs handler if present (for development, not a requirement).
diff --git a/changes/feature_hide_unused_services b/changes/feature_hide_unused_services
deleted file mode 100644
index dc942da2..00000000
--- a/changes/feature_hide_unused_services
+++ /dev/null
@@ -1,2 +0,0 @@
-- Hide the GUI for services that are not supported on the set of
-  configured providers. Closes #4170.