diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-09 09:24:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-09 09:24:48 -0400 |
| commit | 2f3b9151ec55fbfe7467b7e0a5ee3fccd769c0e3 (patch) | |
| tree | 2cf94ef276fef6ad6297c71f58ecec41dcfebc8b | |
| parent | 92b3fc9317c183d1566bc2361e11bafe96d003cd (diff) | |
| parent | 532873a9243041d63f33dc0df37a9101828bd92d (diff) | |
| download | tor-2f3b9151ec55fbfe7467b7e0a5ee3fccd769c0e3.tar.gz tor-2f3b9151ec55fbfe7467b7e0a5ee3fccd769c0e3.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 bb0602f132..9b3fb0a531 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.7-dev]) +AC_INIT([tor],[0.3.3.8]) 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 15d0d32d6d..a86b5cf3f6 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.7-dev" +!define VERSION "0.3.3.8" !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 2fd9831725..e66ab2b658 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.7-dev" +#define VERSION "0.3.3.8" |