diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-07 21:18:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-07 21:18:47 -0500 |
| commit | 7b792b990c49ddbca782ee342bc6b0805b3f0868 (patch) | |
| tree | 0d61554f4605f5816a32c028e054dd0218c483ff | |
| parent | 801af9a7e3f0f8c68294d8dd212b2eedcb481b72 (diff) | |
| parent | b5fdb91adaad7fd863856ad505665908bd24ea15 (diff) | |
| download | tor-7b792b990c49ddbca782ee342bc6b0805b3f0868.tar.gz tor-7b792b990c49ddbca782ee342bc6b0805b3f0868.zip | |
Merge branch 'maint-0.3.3' into release-0.3.3
| -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 a5e1faf4ea..285bf6bc13 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.3.11]) +AC_INIT([tor],[0.3.3.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 aaee0e77e6..826d60de8d 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.3.11" +!define VERSION "0.3.3.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 2131d4f438..b66b0390f6 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.3.11" +#define VERSION "0.3.3.11-dev" |