From 31193d63cdb7fc8a62736547c00f0238ade8b330 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Mon, 18 May 2015 15:53:02 -0700
Subject: [PATCH] version bump and updated changelog

---
 CHANGELOG.md | 8 ++++++++
 version      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f35f84d..e6c542a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # OnionShare Changelog
 
+## 0.7
+
+* Added code signing for Mac OS X
+* Does not disable existing hidden services
+* Uses allowZip64 to allow compressing files >5gb
+* Sets HS dir to be in /var/lib/tor in Tails, to obey AppArmor rules
+* Misc. minor code cleanup
+
 ## 0.6
 
 * Brand new drag-and-drop GUI with ability to start and stop server
diff --git a/version b/version
index 74e1c092..eb49d7c7 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.7develop
+0.7