diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-06 08:29:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-06 08:29:24 -0400 |
| commit | fa66e8a6541b622a19bdd0d0b3f288f552b42eb0 (patch) | |
| tree | d8ae49f6e4689a876d5c9c1e1bce10a8385577e8 | |
| parent | 7a74d5a87ed04a15b6f19d73b145c9f58931e3f8 (diff) | |
| parent | a8bab72c378d7afe1f715c05b93d8328e93d85b7 (diff) | |
| download | tor-fa66e8a6541b622a19bdd0d0b3f288f552b42eb0.tar.gz tor-fa66e8a6541b622a19bdd0d0b3f288f552b42eb0.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 61ea2e84de..e8ceab5119 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.5-rc-dev]) +AC_INIT([tor],[0.3.4.6-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 c7075ad6a9..84ecb91f31 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.4-rc-dev" +!define VERSION "0.3.4.6-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 a41e92a703..81986fd1b1 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.4-rc-dev" +#define VERSION "0.3.4.6-rc" |