diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-03-18 12:18:31 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-03-18 12:18:31 -0400 |
commit | e065f08fe8bca501fdec0bfb91ae4270fa5c7ed6 (patch) | |
tree | e1263eb5606d21be6708d80b61ec53f5ae8f9b2d | |
parent | 87fca699578e7190c37e68a290d72b4a77c2be40 (diff) | |
parent | 3150c3035150924cc10a3edf9b1b44cc1aafa257 (diff) | |
download | tor-e065f08fe8bca501fdec0bfb91ae4270fa5c7ed6.tar.gz tor-e065f08fe8bca501fdec0bfb91ae4270fa5c7ed6.zip |
Merge branch 'maint-0.3.5' into release-0.3.5
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | contrib/win32build/tor-mingw.nsi.in | 2 | ||||
-rw-r--r-- | src/win32/orconfig.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index da158eb23f..bc434ed836 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.10]) +AC_INIT([tor],[0.3.5.10-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 8f5f389637..7252e7eb76 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.10" +!define VERSION "0.3.5.10-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 42e3e1a4c6..2b21abe888 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.10" +#define VERSION "0.3.5.10-dev" |