aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-10-28 09:42:43 -0400
committerDavid Goulet <dgoulet@torproject.org>2021-10-28 09:42:43 -0400
commite0a96cf2b6d2c21e0c8db0a285c0a86286e47821 (patch)
tree314f6f2f91024d5a64213bd257c13fdb87423146
parente51b25c02d44b8ff7f6b84951e0cd90cc100589c (diff)
parentfa438b6cf023df22e78dc2640bcd00da7d08846c (diff)
downloadtor-e0a96cf2b6d2c21e0c8db0a285c0a86286e47821.tar.gz
tor-e0a96cf2b6d2c21e0c8db0a285c0a86286e47821.zip
Merge branch 'maint-0.3.5' into release-0.3.5
-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 7a6566a2c3..1815f65e98 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.5.17"
+!define VERSION "0.3.5.17-dev"
!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 f32c725b07..8170b1bcb4 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.5.17"
+#define VERSION "0.3.5.17-dev"