diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-06-14 11:49:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-06-14 11:49:01 -0400 |
| commit | f86387039897ee1e8cccfc8060e74bdefa70c1fc (patch) | |
| tree | 71fc4e1aae0928ce1c4fcd761c454ad1e110753b | |
| parent | b925cef1e39e98d1b1a329c8945772a2a1c2d1b8 (diff) | |
| parent | 87492154e0a68ae369ea9fc40dcaa037e8f871a4 (diff) | |
| download | tor-f86387039897ee1e8cccfc8060e74bdefa70c1fc.tar.gz tor-f86387039897ee1e8cccfc8060e74bdefa70c1fc.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 82ef4f5554..89ccbc5807 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.15]) +AC_INIT([tor],[0.3.5.15-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 9d2e25a9e8..234971e178 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.15" +!define VERSION "0.3.5.15-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 dff63efa18..c97889ce46 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.15" +#define VERSION "0.3.5.15-dev" |