From ecc3ab33d0791a7f24fbae88378ca90581b0626a Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Wed, 27 May 2015 14:21:19 -0400
Subject: [PATCH] version bump and updated changelog

---
 CHANGELOG.md           | 7 +++++++
 install/onionshare.nsi | 6 +++---
 version                | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6c542a4..63c862ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # OnionShare Changelog
 
+## 0.7.1
+
+* Fixed critical bug in OS X binaries that caused crashes on some computers
+* Added Security Design document
+* Minor bug fix with Windows code signing timestamp server
+* Linux version uses HS dir that is allowed by Tor Browser Launcher's AppArmor profiles
+
 ## 0.7
 
 * Added code signing for Mac OS X
diff --git a/install/onionshare.nsi b/install/onionshare.nsi
index 88e9e716..c1d7bec0 100644
--- a/install/onionshare.nsi
+++ b/install/onionshare.nsi
@@ -6,7 +6,7 @@
 !define INSTALLSIZE 31187
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 7
-!define VERSIONSTRING "0.7"
+!define VERSIONSTRING "0.7.1"
 
 RequestExecutionLevel admin
 
@@ -42,7 +42,7 @@ ${EndIf}
     !system "$\"${NSISDIR}\makensis$\" /DINNER onionshare.nsi" = 0
     !system "$%TEMP%\tempinstaller.exe" = 2
     !system "signtool.exe sign /v /d $\"Uninstall OnionShare$\" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll $%TEMP%\uninstall.exe" = 0
-    
+
     # all done, now we can build the real installer
     OutFile "..\dist\OnionShare_Setup.exe"
     SetCompressor /FINAL /SOLID lzma
@@ -55,7 +55,7 @@ Function .onInit
     !endif
 
     setShellVarContext all
-    !insertmacro VerifyUserIsAdmin    
+    !insertmacro VerifyUserIsAdmin
 FunctionEnd
 
 Section "install"
diff --git a/version b/version
index eb49d7c7..39e898a4 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.7
+0.7.1