diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-12 08:57:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-12 08:57:37 -0400 |
| commit | ef0b19aec68bf48018f4c833778bc9b966ab9a25 (patch) | |
| tree | 3cb07f5897b88681dc18255c84e9813d2ac6d50c | |
| parent | 7b7b817c3ef68d7272ceec2ea0bdbd04684ae5dd (diff) | |
| parent | f2e7570c75ec8d0f0415530461a4c5b3695fc671 (diff) | |
| download | tor-ef0b19aec68bf48018f4c833778bc9b966ab9a25.tar.gz tor-ef0b19aec68bf48018f4c833778bc9b966ab9a25.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 f7e3c1e947..e5c28b03b2 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.6-dev]) +AC_INIT([tor],[0.3.3.7]) 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 11ca7e2e3d..56d227b08d 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.6-dev" +!define VERSION "0.3.3.7" !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 5b3ea62f22..5a3fd3c2f0 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.6-dev" +#define VERSION "0.3.3.7" |