summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-03-28 15:54:59 -0400
committerNick Mathewson <nickm@torproject.org>2016-03-28 15:54:59 -0400
commit447b1c6b1d235e6de6b888e62bce9021895ae4b1 (patch)
tree0fc6a7c3d9500733a3c9de893d7835757c778b29
parenta3f36bfd81726d25dde3c4841ae0324a2c72b481 (diff)
downloadtor-447b1c6b1d235e6de6b888e62bce9021895ae4b1.tar.gz
tor-447b1c6b1d235e6de6b888e62bce9021895ae4b1.zip
Begin an 0.2.9 branchtor-0.2.9.0-root
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac2
-rw-r--r--contrib/win32build/tor-mingw.nsi.in2
-rw-r--r--src/win32/orconfig.h2
4 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c93348ac01..f3891a74a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Changes in version 0.2.9.1-alpha - 2016-??-??
+
+
Changes in version 0.2.8.2-alpha - 2016-03-28
Tor 0.2.8.2-alpha is the second alpha in its series. It fixes numerous
bugs in earlier versions of Tor, including some that prevented
diff --git a/configure.ac b/configure.ac
index ad71f7fdda..ed5d2be6d3 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.8.2-alpha-dev])
+AC_INIT([tor],[0.2.9.0-alpha-dev])
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 1ddec0e761..47fb7e0cd2 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.8.2-alpha-dev"
+!define VERSION "0.2.9.0-alpha-dev"
!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 67d023dd8d..9469245ba7 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.2.8.2-alpha-dev"
+#define VERSION "0.2.9.0-alpha-dev"