From 1d1648bb9003444b46d398dc551c3b2ad5a8a622 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Wed, 17 Jan 2018 19:36:56 -0800
Subject: Version bump to 1.2 and updated changelog

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6a80932..b6cd3d49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # OnionShare Changelog
 
+## 1.2
+
+* New feature: Support for Tor bridges, including obfs4proxy
+* New feature: Ability to use a persistent URL
+* New feature: Auto-stop timer, to stop OnionShare at a specified time
+* New feature: Get notification when Tor connection dies
+* Updated versions of python, Qt, tor, and other dependencies that are bundled
+* Added ability to supply a custom settings file as a command line arg
+* Fixed various small user interface issues
+
 ## 1.1
 
 * OnionShare connects to Tor itself now, so opening Tor Browser in the background isn't required
-- 
cgit v1.2.3-54-g00ecf