diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-10-26 09:18:08 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-10-26 09:18:08 -0400 |
| commit | df6e03a09268d5996295dd61cbee3e4845395c6e (patch) | |
| tree | f6c32e133944063143a477732677a3a4c5030f6d | |
| parent | 08e4b8d2fcc47a9e2b4666fbdd2f7c27cda5bed6 (diff) | |
| parent | 9280f32fc0e4ab61b6cd06a640d285188f845106 (diff) | |
| download | tor-df6e03a09268d5996295dd61cbee3e4845395c6e.tar.gz tor-df6e03a09268d5996295dd61cbee3e4845395c6e.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5tor-0.3.5.17
| -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 e698bf8901..855eb6441a 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.16-dev]) +AC_INIT([tor],[0.3.5.17]) 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 c8695bc86c..7a6566a2c3 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.16" +!define VERSION "0.3.5.17" !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 273806fde3..f32c725b07 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.16" +#define VERSION "0.3.5.17" |