From c3cfe68f4503e70e920463883062f25b06378715 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Wed, 17 May 2017 09:10:21 -0700
Subject: [PATCH] Updated changelog and version bump to 1.1.dev1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 392f2e34..7fdd97b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # OnionShare Changelog
 
+## 1.1
+
+* OnionShare connects to Tor itself now, so opening Tor Browser in the background isn't required
+* In Windows and macOS, OnionShare alerts users about updates
+* Removed the menu bar, and adding a Settings button
+
 ## 1.0
 
 * Fixed long-standing macOS X bug that caused OnionShare to crash on older Macs (!)
diff --git a/install/onionshare.nsi b/install/onionshare.nsi
index 84029a9c..914d82c5 100644
--- a/install/onionshare.nsi
+++ b/install/onionshare.nsi
@@ -5,8 +5,8 @@
 # change these with each release
 !define INSTALLSIZE 39265
 !define VERSIONMAJOR 1
-!define VERSIONMINOR 0
-!define VERSIONSTRING "1.0.0"
+!define VERSIONMINOR 1
+!define VERSIONSTRING "1.1.dev1"
 
 RequestExecutionLevel admin
 
diff --git a/share/version.txt b/share/version.txt
index d3827e75..6da0f901 100644
--- a/share/version.txt
+++ b/share/version.txt
@@ -1 +1 @@
-1.0
+1.1.dev1