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
diff --git a/install/onionshare.nsi b/install/onionshare.nsi
index c0a39f35..9c15de47 100644
--- a/install/onionshare.nsi
+++ b/install/onionshare.nsi
@@ -3,10 +3,10 @@
 !define ABOUTURL "https:\\onionshare.org\"
 
 # change these with each release
-!define INSTALLSIZE 54112
+!define INSTALLSIZE 66525
 !define VERSIONMAJOR 1
-!define VERSIONMINOR 1
-!define VERSIONSTRING "1.1"
+!define VERSIONMINOR 2
+!define VERSIONSTRING "1.2"
 
 RequestExecutionLevel admin
 
diff --git a/share/version.txt b/share/version.txt
index 9459d4ba..5625e59d 100644
--- a/share/version.txt
+++ b/share/version.txt
@@ -1 +1 @@
-1.1
+1.2