From 841351e612e1891c6754eb8fba817e7b1afe6c24 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sat, 6 Mar 2010 22:39:34 -0500 Subject: [PATCH] clean up the 0.2.1.25 changelog --- ChangeLog | 24 +++++++++++++----------- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index d98b262821..d2efce8c04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,20 +1,22 @@ -Changes in version 0.2.1.25 - 2010-??-?? +Changes in version 0.2.1.25 - 2010-03-?? o Major bugfixes: - - When freeing a cipher, zero it out completely. We only zeroed - the first ptrsize bytes. Bugfix on tor-0.0.2pre8. Discovered - and patched by ekir. Fixes bug 1254. - - Avoid a bug that set IPs incorrectly on relays that did't set - Address to an IP address, when that address fails to resolve. - Fixes bug 1269. + - Fix a regression from our patch for bug 1244 that caused relays + to guess their IP address incorrectly if they didn't set Address + in their torrc and/or their address fails to resolve. Bugfix on + 0.2.1.23; fixes bug 1269. + - When freeing a session key, zero it out completely. We only zeroed + the first ptrsize bytes. Bugfix on 0.0.2pre8. Discovered and + patched by ekir. Fixes bug 1254. o Minor bugfixes: - Fix a dereference-then-NULL-check sequence when publishing - descriptors. Bugfix on tor-0.2.1.5-alpha. Discovered by ekir, - fixes bug 1255. + descriptors. Bugfix on 0.2.1.5-alpha. Discovered by ekir; fixes + bug 1255. - Fix another dereference-then-NULL-check sequence. Bugfix on - 0.2.1.14-rc. Discovered by ekir, fixes bug 1256. + 0.2.1.14-rc. Discovered by ekir; fixes bug 1256. - Make sure we treat potentially not NUL-terminated strings correctly. - Bugfix on 0.1.1.13-alpha. Discovered by rieo, fixes bug 1257. + Bugfix on 0.1.1.13-alpha. Discovered by rieo; fixes bug 1257. + Changes in version 0.2.1.24 - 2010-02-21 Tor 0.2.1.24 makes Tor work again on the latest OS X -- this time diff --git a/configure.in b/configure.in index f0417b1d97..f84d10b0f2 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.24) +AM_INIT_AUTOMAKE(tor, 0.2.1.24-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index f965a2a1f9..9f747d708e 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.1.24" +!define VERSION "0.2.1.24-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 d8b3bce4c0..49bb58376d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.24" +#define VERSION "0.2.1.24-dev" -- 2.11.4.GIT