Fold in changes and update relnotes

22 files changed, 41 insertions, 30 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e8d24c95..c47e531a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,36 @@ History
 2014
 ====
 
+0.6.1 August 15 -- the "knock knock knocking on beta's door" release:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+- Add checks to ensure that the backend is alive or notify the
+  user. Related to #5873.
+- Stop the backend if the frontend process does not exist any more and
+  backend is not a daemon. Related to #5873.
+- Add autostart on Linux. Closes #4989.
+- Pressing ESC on 'install helper files' defaults to No. Closes #5819.
+- Replace twisted thread with QThread and get pastebin send
+  working. Closes #5949.
+- Wait until EIP is up to autologin. Closes #5939
+- Fix the handling of vpn launcher errors in the UI. Closes: #5955
+- Fix logger window blocking the bitmask quit().
+- Set the standalone value for BaseConfig according to the global
+  flags.
+- Improve Hide and Show Window behavior on Ubuntu. Fixes #5511.
+- Use smaller height on the window so it fits better on smaller
+  resolutions. Closes #5722.
+- Disable daemon mode when we run the backend so we can spawn child
+  processes on it.
+- Restrict access to the zmq certificates folder.
+- Stop the services if the selected provider is changed. Related to
+  #4704. Closes #5912, #5554.
+- Minor adjustments to the layout of UI elements. Fixes #5514, #5515,
+  #5510.
+- Moved provider selection dropdown menu to be at the top of the main
+  windowUse same user/password restrictions as in the webapp. Closes
+  #5894.
+
 0.6.0 July 18 -- the "nothing to see here" release:
 +++++++++++++++++++++++++++++++++++++++++++++++++++
 
diff --git a/changes/4035_add-eip-cancel-button b/changes/4035_add-eip-cancel-button
deleted file mode 100644
index ea63f8a4..00000000
--- a/changes/4035_add-eip-cancel-button
+++ /dev/null
@@ -1 +0,0 @@
-- Add a button for cancelling ongoing EIP connection. Closes: #4035
diff --git a/changes/5870_bitmask-prevent-system-logout-on-linux b/changes/5870_bitmask-prevent-system-logout-on-linux
deleted file mode 100644
index 6feba46c..00000000
--- a/changes/5870_bitmask-prevent-system-logout-on-linux
+++ /dev/null
@@ -1 +0,0 @@
-- Bitmask on linux prevents session logout. Closes #5870.
diff --git a/changes/add-backend-alive-check b/changes/add-backend-alive-check
deleted file mode 100644
index 40e12978..00000000
--- a/changes/add-backend-alive-check
+++ /dev/null
@@ -1 +0,0 @@
-- Add checks to ensure that the backend is alive or notify the user. Related to #5873.
diff --git a/changes/add-frontend-alive-check b/changes/add-frontend-alive-check
deleted file mode 100644
index 54f88798..00000000
--- a/changes/add-frontend-alive-check
+++ /dev/null
@@ -1,2 +0,0 @@
-- Stop the backend if the frontend process does not exist any more and backend
-  is not a daemon. Related to #5873.
diff --git a/changes/add-linux-autostart b/changes/add-linux-autostart
deleted file mode 100644
index 44b175bc..00000000
--- a/changes/add-linux-autostart
+++ /dev/null
@@ -1 +0,0 @@
-- Add autostart on Linux. Closes #4989.
diff --git a/changes/bug-5819_default-esc-to-no b/changes/bug-5819_default-esc-to-no
deleted file mode 100644
index 4dc1f6a2..00000000
--- a/changes/bug-5819_default-esc-to-no
+++ /dev/null
@@ -1 +0,0 @@
-- Pressing ESC on 'install helper files' defaults to No. Closes #5819.
diff --git a/changes/bug-5949_pastebin-does-not-work b/changes/bug-5949_pastebin-does-not-work
deleted file mode 100644
index aa983184..00000000
--- a/changes/bug-5949_pastebin-does-not-work
+++ /dev/null
@@ -1 +0,0 @@
-- Replace twisted thread with QThread and get pastebin send working. Closes #5949.
diff --git a/changes/bug_5939_wait-for-eip-to-autologin b/changes/bug_5939_wait-for-eip-to-autologin
deleted file mode 100644
index 5dec8331..00000000
--- a/changes/bug_5939_wait-for-eip-to-autologin
+++ /dev/null
@@ -1 +0,0 @@
-- Wait until EIP is up to autologin. Closes #5939
diff --git a/changes/bug_5955_fix-vpnlauncher-error-ui b/changes/bug_5955_fix-vpnlauncher-error-ui
deleted file mode 100644
index d322288e..00000000
--- a/changes/bug_5955_fix-vpnlauncher-error-ui
+++ /dev/null
@@ -1 +0,0 @@
-- Fix the handling of vpn launcher errors in the UI. Closes: #5955
diff --git a/changes/bug_logger-hangs-quit b/changes/bug_logger-hangs-quit
deleted file mode 100644
index b76f6218..00000000
--- a/changes/bug_logger-hangs-quit
+++ /dev/null
@@ -1 +0,0 @@
-- Fix logger window blocking the bitmask quit().
diff --git a/changes/bug_set-standalone-flags-for-baseconfig b/changes/bug_set-standalone-flags-for-baseconfig
deleted file mode 100644
index bf84d3e8..00000000
--- a/changes/bug_set-standalone-flags-for-baseconfig
+++ /dev/null
@@ -1 +0,0 @@
-- Set the standalone value for BaseConfig according to the global flags.
diff --git a/changes/bug_show_hide_improved b/changes/bug_show_hide_improved
deleted file mode 100644
index 39472074..00000000
--- a/changes/bug_show_hide_improved
+++ /dev/null
@@ -1 +0,0 @@
-- Improve Hide and Show Window behavior on Ubuntu. Fixes #5511.
\ No newline at end of file
diff --git a/changes/bug_use-smaller-window-to-fit-lower-resolutions b/changes/bug_use-smaller-window-to-fit-lower-resolutions
deleted file mode 100644
index d9df69ae..00000000
--- a/changes/bug_use-smaller-window-to-fit-lower-resolutions
+++ /dev/null
@@ -1 +0,0 @@
-- Use smaller height on the window so it fits better on smaller resolutions. Closes #5722.
diff --git a/changes/disable-user-pass-remembering b/changes/disable-user-pass-remembering
deleted file mode 100644
index 45411001..00000000
--- a/changes/disable-user-pass-remembering
+++ /dev/null
@@ -1 +0,0 @@
-- Temporarily disable username/password remembering to avoid keyring issues. Related to #4190.
diff --git a/changes/enable-child-process-in-backend b/changes/enable-child-process-in-backend
deleted file mode 100644
index 1b6f246e..00000000
--- a/changes/enable-child-process-in-backend
+++ /dev/null
@@ -1 +0,0 @@
-- Disable daemon mode when we run the backend so we can spawn child processes on it.
diff --git a/changes/feature_restrict-certificates-permissions b/changes/feature_restrict-certificates-permissions
deleted file mode 100644
index 6bd6c015..00000000
--- a/changes/feature_restrict-certificates-permissions
+++ /dev/null
@@ -1 +0,0 @@
-- Restrict access to the zmq certificates folder.
diff --git a/changes/feature_single-provider-at-a-time b/changes/feature_single-provider-at-a-time
deleted file mode 100644
index ac4ed327..00000000
--- a/changes/feature_single-provider-at-a-time
+++ /dev/null
@@ -1 +0,0 @@
-- Stop the services if the selected provider is changed. Related to #4704. Closes #5912, #5554.
diff --git a/changes/minor-ui-adjustments b/changes/minor-ui-adjustments
deleted file mode 100644
index 33e27964..00000000
--- a/changes/minor-ui-adjustments
+++ /dev/null
@@ -1 +0,0 @@
-- minor adjustments to the layout of UI elements (#5514, #5515, #5510).
diff --git a/changes/provider-combo-on-top b/changes/provider-combo-on-top
deleted file mode 100644
index 8aceb7df..00000000
--- a/changes/provider-combo-on-top
+++ /dev/null
@@ -1 +0,0 @@
-- moved provider selection dropdown menu to be at the top of the main window
\ No newline at end of file
diff --git a/changes/use-same-user-and-pass-restrictions-as-in-the-webapp b/changes/use-same-user-and-pass-restrictions-as-in-the-webapp
deleted file mode 100644
index 88d97f00..00000000
--- a/changes/use-same-user-and-pass-restrictions-as-in-the-webapp
+++ /dev/null
@@ -1 +0,0 @@
-Use same user/password restrictions as in the webapp. Closes #5894.
diff --git a/relnotes.txt b/relnotes.txt
index 925db87d..183d1f86 100644
--- a/relnotes.txt
+++ b/relnotes.txt
@@ -1,8 +1,8 @@
-ANNOUNCING Bitmask, the Internet Encryption Toolkit, release 0.6.0
+ANNOUNCING Bitmask, the Internet Encryption Toolkit, release 0.6.1
 
 The LEAP  team is  pleased to announce  the immediate  availability of
-version 0.6.0  of Bitmask,  the Internet Encryption  Toolkit, codename
-"nothing to see here".
+version 0.6.1 of Bitmask,  the Internet Encryption  Toolkit,  codename
+"knock knock knocking on beta's door".
 
 https://downloads.leap.se/client/
 
@@ -43,11 +43,13 @@ NOT trust your life to it.
 
 WHAT CAN THIS VERSION OF BITMASK DO FOR ME?
 
-Bitmask   0.6.0  improves   how   email  encryption/decryption   works
-internally to  improve speed  and CPU  consumption. This  release also
-merges a big refactor we've been  working on for some time, which will
-give us  room for a  lot of improvements in  the near future.  You can
-refer to the CHANGELOG for the meat.
+Bitmask 0.6.1  is the new stable  version of the client  after the big
+refactor,  with  a  little face  lift  of  the  UI  while we  were  at
+it. Encrypted  Email is still not  stable though, so don't  use it for
+high security. Encrypted Internet is  the first service we are calling
+stable, although  its security level is  just a bit higher  than plain
+OpenSSL, so  use accordingly. You can  refer to the CHANGELOG  for the
+meat.
 
 Encrypted Internet on Linux now  helps you don't shoot yourself in the
 foot  by   leaking  traffic  outside  of  the   secure  connection  it
@@ -106,6 +108,6 @@ beyond any border.
 
 The LEAP team,
 
-July 18, 2014
+August 15, 2014
 Somewhere in the middle of the intertubes.
 EOF