diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-22 12:40:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-22 12:40:27 -0400 |
| commit | 0b8de7b3c3b62fe553b8e5c75d2f85ab22628e01 (patch) | |
| tree | 833b727b37a071878c8a5ee83e0137f7f72a0bfc | |
| parent | b6a88173bbf048cbab87e2bcdd29718a4b5e6837 (diff) | |
| parent | 074b182baa091881d1741a6a66a08fef09090777 (diff) | |
| download | tor-0b8de7b3c3b62fe553b8e5c75d2f85ab22628e01.tar.gz tor-0b8de7b3c3b62fe553b8e5c75d2f85ab22628e01.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 44235024c8..fbe6450e88 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.5-rc-dev]) +AC_INIT([tor],[0.3.3.6]) 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 c27e244b53..164d275185 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.5-rc-dev" +!define VERSION "0.3.3.6" !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 de1bc8c858..bb683e009e 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.5-rc-dev" +#define VERSION "0.3.3.6" |