aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-24 09:11:38 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-24 09:11:38 -0400
commit4d308789e2133261e30b0dac8c31a5517ac2fd3f (patch)
tree82119a73f122ebd0f713fd6fb62919eb9254ed5b
parent0ad7317107ce176bb2221f3d3128ec4b9c3e7bbc (diff)
parent7bebd1b02551bb232fef73aa7f81c11ed6125a25 (diff)
downloadtor-4d308789e2133261e30b0dac8c31a5517ac2fd3f.tar.gz
tor-4d308789e2133261e30b0dac8c31a5517ac2fd3f.zip
Merge branch 'maint-0.3.0' into release-0.3.0
-rw-r--r--contrib/win32build/tor-mingw.nsi.in2
-rw-r--r--src/win32/orconfig.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index 48a4d8e753..a179d8483e 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.3.0.11-dev"
+!define VERSION "0.3.0.12"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 7399f8178b..47a00dc6d6 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.3.0.11-dev"
+#define VERSION "0.3.0.12"