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 | 5ced052a1e95b7632b97f115dce4c2264994895f (patch) | |
| tree | 9c289c063b48b2d86bf8baf501703c9903f7edc3 | |
| parent | 61c13936015493a5b7224887b6a319db761f9983 (diff) | |
| parent | afee785417cba083c4914fd9b6db49498c2eb241 (diff) | |
| download | tor-5ced052a1e95b7632b97f115dce4c2264994895f.tar.gz tor-5ced052a1e95b7632b97f115dce4c2264994895f.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 27cb0323c2..8cc509c430 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.3-alpha-dev]) +AC_INIT([tor],[0.3.4.4-rc]) 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 32f1f23e7d..bdf310bc99 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.3-alpha-dev" +!define VERSION "0.3.4.4-rc" !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 757ea2945e..45578f9bb8 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.3-alpha-dev" +#define VERSION "0.3.4.4-rc" |