summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog25
-rw-r--r--configure.ac2
-rw-r--r--contrib/win32build/tor-mingw.nsi.in2
-rw-r--r--src/win32/orconfig.h2
4 files changed, 28 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index aa9aace759..7a10a7ce96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+Changes in version 0.2.9.5-rc - 2016-1?-??
+
+
+Changes in version 0.2.8.9 - 2016-10-17
+ Tor 0.2.8.9 backports a fix for a security hole in previous versions
+ of Tor that would allow a remote attacker to crash a Tor client,
+ hidden service, relay, or authority. All Tor users should upgrade to
+ this version, or to 0.2.9.4-alpha. Patches will be released for older
+ versions of Tor.
+
+ o Major features (security fixes, also in 0.2.9.4-alpha):
+ - Prevent a class of security bugs caused by treating the contents
+ of a buffer chunk as if they were a NUL-terminated string. At
+ least one such bug seems to be present in all currently used
+ versions of Tor, and would allow an attacker to remotely crash
+ most Tor instances, especially those compiled with extra compiler
+ hardening. With this defense in place, such bugs can't crash Tor,
+ though we should still fix them as they occur. Closes ticket
+ 20384 (TROVE-2016-10-001).
+
+ o Minor features (geoip):
+ - Update geoip and geoip6 to the October 4 2016 Maxmind GeoLite2
+ Country database.
+
+
Changes in version 0.2.9.4-alpha - 2016-10-17
Tor 0.2.9.4-alpha fixes a security hole in previous versions of Tor
that would allow a remote attacker to crash a Tor client, hidden
diff --git a/configure.ac b/configure.ac
index 9bad7b43b3..d35f83cead 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.4-alpha])
+AC_INIT([tor],[0.2.9.4-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 d24e9025ac..94bbfe28e2 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.4-alpha"
+!define VERSION "0.2.9.4-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 3c13ff2ae9..d90242320a 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.4-alpha"
+#define VERSION "0.2.9.4-alpha-dev"