diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-02-21 13:25:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-02-21 13:25:39 -0500 |
| commit | 635c59d553e420c4c54b95ac56b7d52f53a53111 (patch) | |
| tree | 5fb4bb5dde0aaa2dd7e752763fe1d99956ddbdd3 | |
| parent | 4fd31340f3355342deebf49b586ae38bc2e9c8fe (diff) | |
| parent | a56b9501f1b7a13f4c73d41bba7fde80de7fd5b7 (diff) | |
| download | tor-635c59d553e420c4c54b95ac56b7d52f53a53111.tar.gz tor-635c59d553e420c4c54b95ac56b7d52f53a53111.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -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 c8a641a4c2..bb807094a5 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.4.11]) +AC_INIT([tor],[0.3.4.11-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index af0ce944aa..18bc2a62ca 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.4.11" +!define VERSION "0.3.4.11-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 3901be2f88..434b6dd4c8 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.4.11" +#define VERSION "0.3.4.11-dev" |