From 7c3d7c668cfc822171815721b26ccac33aaab6d0 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Sun, 21 Apr 2019 14:13:43 -0700
Subject: Version bump to 2.1.dev1 and updated changelog

---
 CHANGELOG.md      | 7 +++++++
 share/version.txt | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 392df41f..e2534e19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # OnionShare Changelog
 
+## 2.1
+
+* New feature: Auto-start timer, which allows scheduling when the server starts
+* Renamed CLI argument --debug to --verbose
+* Make Tor connection timeout configurable as a CLI argument
+* New translations: [TODO: include final list]
+
 ## 2.0
 
 * New feature: Receiver mode allows you to receive files with OnionShare, instead of only sending files
diff --git a/share/version.txt b/share/version.txt
index cd5ac039..cd2953d7 100644
--- a/share/version.txt
+++ b/share/version.txt
@@ -1 +1 @@
-2.0
+2.1.dev1
-- 
cgit v1.2.3-54-g00ecf