summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-12-01 13:36:38 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-01 13:36:38 -0500
commit9e297f819738b1ae58982db89c19ba9c99236c0c (patch)
tree60334003b5e3cf7f291303df458dafb3d4e187f8
parent82bd2af78df57206bdcc81e7343a78b7f07c4a1b (diff)
downloadtor-9e297f819738b1ae58982db89c19ba9c99236c0c.tar.gz
tor-9e297f819738b1ae58982db89c19ba9c99236c0c.zip
Bump to 0.2.9.6-rc
-rw-r--r--configure.ac2
-rw-r--r--contrib/win32build/tor-mingw.nsi.in2
-rw-r--r--src/win32/orconfig.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 1d56b9bcd6..98dad9bcff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.5-alpha-dev])
+AC_INIT([tor],[0.2.9.6-rc])
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 3086e9bc3f..7771dd2ce0 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.2.9.5-alpha-dev"
+!define VERSION "0.2.9.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 7f427964d2..76bb1b8848 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.2.9.5-alpha-dev"
+#define VERSION "0.2.9.6-rc"