diff options
author | Nick Mathewson <nickm@torproject.org> | 2021-01-28 11:20:20 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2021-01-28 11:20:20 -0500 |
commit | dec3041952ae4c9ea0ed621b149e6e047738c617 (patch) | |
tree | 40c96b6b1e9592602d66bb328aacbc7604331bfd | |
parent | d4e5066bf2d1e3092c4870f6c5f7fa5576af5f5a (diff) | |
parent | 3ebf75993f8c64ea0bc022bde69ccdf879bcaeaf (diff) | |
download | tor-dec3041952ae4c9ea0ed621b149e6e047738c617.tar.gz tor-dec3041952ae4c9ea0ed621b149e6e047738c617.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 642e4cf09c..1f2af57ef7 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.12-dev]) +AC_INIT([tor],[0.3.5.13]) 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 37a0e1e93b..04a720a171 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.12-dev" +!define VERSION "0.3.5.13" !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 e67ff13b13..1c0ce18e73 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.12-dev" +#define VERSION "0.3.5.13" |