From c79db17ec1982fdd871907cc925efd1e90a318a7 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 6 Sep 2011 20:56:42 -0400 Subject: [PATCH] fold in changes files so far --- ChangeLog | 18 ++++++++++++++++++ changes/bug3898a | 6 ------ changes/bug3923 | 5 ----- changes/msvc_lround | 4 ---- 4 files changed, 18 insertions(+), 15 deletions(-) delete mode 100644 changes/bug3898a delete mode 100644 changes/bug3923 delete mode 100644 changes/msvc_lround diff --git a/ChangeLog b/ChangeLog index 7b2581662a..58c17a861d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Changes in version 0.2.2.33 - 2011-09-?? + o Major bugfies: + - Avoid an assertion failure when reloading a configuration with + TrackExitHosts changes. Found and fixed by 'laruldan'. Fixes bug + 3923; bugfix on 0.2.2.25-alpha. + + o Minor bugfixes: + - Correct the man page to explain that HashedControlPassword and + CookieAuthentication can both be set, in which case either method + is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, + when we decided to allow these config options to both be set. Issue + raised by bug 3898. + + o Build fixes: + - Provide a substitute implementation of lround() for MSVC, which + apparently lacks it. Patch from Gisle Vanem. + + Changes in version 0.2.2.32 - 2011-08-27 The Tor 0.2.2 release series is dedicated to the memory of Andreas Pfitzmann (1958-2010), a pioneer in anonymity and privacy research, diff --git a/changes/bug3898a b/changes/bug3898a deleted file mode 100644 index d40445e340..0000000000 --- a/changes/bug3898a +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Correct the man page to explain that HashedControlPassword and - CookieAuthentication can both be set, in which case either method - is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha, - when we decided to allow these config options to both be set. Issue - raised by bug 3898. diff --git a/changes/bug3923 b/changes/bug3923 deleted file mode 100644 index 9c0e138826..0000000000 --- a/changes/bug3923 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfies: - - Avoid an assertion failure when reloading a configuration with - TrackExitHosts changes. Found and fixed by 'laruldan'. Fixes - bug 3923; bugfix on 0.2.2.25-alpha. - diff --git a/changes/msvc_lround b/changes/msvc_lround deleted file mode 100644 index e4aea95351..0000000000 --- a/changes/msvc_lround +++ /dev/null @@ -1,4 +0,0 @@ - o Build fixes: - - Provide a substitute implementation of lround() for MSVC, which - apparently lacks it. Patch from Gisle Vanem. - -- 2.47.3