diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-03-13 16:57:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-03-13 16:57:42 -0400 |
| commit | 36ae644fcd8009b7b719e3d389ac84201129a678 (patch) | |
| tree | f61269b58990b9db1802bdf37219072b0293b425 | |
| parent | 8fef85306e99fd7d0f9371bedbca015b08359f22 (diff) | |
| parent | d17108a187e32a4d5464d2428b8943702c6d5cde (diff) | |
| download | tor-36ae644fcd8009b7b719e3d389ac84201129a678.tar.gz tor-36ae644fcd8009b7b719e3d389ac84201129a678.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -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 834fea073a..da158eb23f 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.9-dev]) +AC_INIT([tor],[0.3.5.10]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 9eeb328223..8f5f389637 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.5.9-dev" +!define VERSION "0.3.5.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 baad733d0f..42e3e1a4c6 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.5.9-dev" +#define VERSION "0.3.5.10" |