diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-07 10:23:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-07 10:23:40 -0500 |
| commit | 4f5ea89c117c66def603bc6f4d046e2142a76467 (patch) | |
| tree | 658334d59cb1255ae455fb90ebd324f209cb7b07 | |
| parent | 248056d9dbc0fb08d3f18872b8fda88dc09a3478 (diff) | |
| parent | ea47563dd7da134e8adfa8bff0515ee925318013 (diff) | |
| download | tor-4f5ea89c117c66def603bc6f4d046e2142a76467.tar.gz tor-4f5ea89c117c66def603bc6f4d046e2142a76467.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4tor-0.3.4.10
| -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 14c87cd1bb..8188dc4515 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.9-dev]) +AC_INIT([tor],[0.3.4.10]) 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 92de557781..f5268249e0 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.9-dev" +!define VERSION "0.3.4.10" !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 1f1e56e76c..1de4c66a48 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.9-dev" +#define VERSION "0.3.4.10" |