diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-18 08:04:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-18 08:04:40 -0500 |
| commit | 580c68ec1d15b53ae187d846804e08b99b4a514b (patch) | |
| tree | 71c6c84df88ea865bdadeb394194502b65ca2c92 | |
| parent | 7f98df0731314f4a3d5dd82fc3f1db3f13dacf9c (diff) | |
| parent | d8f41c2870a2d5addaf9ac4fa0d2674b7be1ce0b (diff) | |
| download | tor-580c68ec1d15b53ae187d846804e08b99b4a514b.tar.gz tor-580c68ec1d15b53ae187d846804e08b99b4a514b.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 c0d58c4faa..563ed94f49 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.5-alpha-dev]) +AC_INIT([tor],[0.3.5.6-rc]) 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 99685598fa..da7f2330e7 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.5-alpha-dev" +!define VERSION "0.3.5.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 94bcbbd4dc..b7bdf993ec 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.5-alpha-dev" +#define VERSION "0.3.5.6-rc" |