From 37d5e3b42af7ac5df3d499af75f1f20a3f498a77 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Fri, 26 Jun 2015 14:35:22 +0200
Subject: [PATCH] version 2.3.3, release notes

---
 RELEASE-NOTES  | 6 ++++++
 lib/version.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e12a43d1c..c7e3280d5 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,9 @@
+# Release 2.3.3
+ * fix proxy settings (issue #1309)
+ * improvements to the transaction dialog:
+    - request password after showing transaction
+    - show change addresses in yellow color
+
 # Release 2.3.2
  * minor bugfixes
  * updated ledger plugin
diff --git a/lib/version.py b/lib/version.py
index 398fa23de..1e884faa7 100644
--- a/lib/version.py
+++ b/lib/version.py
@@ -1,4 +1,4 @@
-ELECTRUM_VERSION = "2.3.2"  # version of the client package
+ELECTRUM_VERSION = "2.3.3"  # version of the client package
 PROTOCOL_VERSION = '0.9'    # protocol version requested
 NEW_SEED_VERSION = 11       # electrum versions >= 2.0
 OLD_SEED_VERSION = 4        # electrum versions < 2.0