commit 67462937a24d24c04146e2547d853b4a42c0d718 Author: Roger Dingledine arma@torproject.org Date: Sun May 29 15:34:38 2011 -0400
fold in recent changes entries --- ChangeLog | 22 +++++++++++++++++++--- changes/bug2574 | 3 --- changes/bug3208 | 6 ------ changes/exit-policy-default-is-not-a-prefix | 5 ----- changes/feature3049 | 6 ------ 5 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 92478b3..42d4e14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,30 @@ -Changes in version 0.2.2.28-beta - 2011-05-2? +Changes in version 0.2.2.28-beta - 2011-05-3? o Major bugfixes: - Don't decide to make a new descriptor when receiving a HUP signal. This bug has caused a lot of 0.2.2.x relays to disappear from the consensus periodically. Fixes the most common case of triggering bug 1810; bugfix on 0.2.2.7-alpha. + - Actually allow nameservers with IPv6 addresses. Fixes bug 2574. + + o Major features: + - Add an __OwningControllerProcess configuration option and a + TAKEOWNERSHIP control-port command. Now a Tor controller can ensure + that when it exits, Tor will shut down. Implements feature 3049. + + o Minor bugfixes: + - Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option. + - Remove a trailing asterisk from "exit-policy/default" in the + output of the control port command "GETINFO info/names". Bugfix + on 0.1.2.5-alpha.
o Minor features: - Relays now log the reason for publishing a new relay descriptor, - so we have a better chance of hunting down the root cause of bug - 1810. Resolves ticket 3252. + so we have a better chance of hunting down instances of bug 1810. + Resolves ticket 3252. + + o Removed options: + - Remove undocumented option "-F" from tor-resolve: it hasn't done + anything since 0.2.1.16-rc.
Changes in version 0.2.2.27-beta - 2011-05-18 diff --git a/changes/bug2574 b/changes/bug2574 deleted file mode 100644 index 5cf2dae..0000000 --- a/changes/bug2574 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Allow nameservers with IPv6 address. Fixes bug 2574. - diff --git a/changes/bug3208 b/changes/bug3208 deleted file mode 100644 index fd737ba..0000000 --- a/changes/bug3208 +++ /dev/null @@ -1,6 +0,0 @@ - o Removed options: - - Remove undocumented option "-F" from tor-resolve: it hasn't done - anything since 0.2.1.16-rc. - - o Minor bugfixes: - - Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option. diff --git a/changes/exit-policy-default-is-not-a-prefix b/changes/exit-policy-default-is-not-a-prefix deleted file mode 100644 index 6eb1e8d..0000000 --- a/changes/exit-policy-default-is-not-a-prefix +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Remove a trailing asterisk from "exit-policy/default" in the - output of the control port command "GETINFO info/names". Bugfix - on 0.1.2.5-alpha. - diff --git a/changes/feature3049 b/changes/feature3049 deleted file mode 100644 index 7960a1f..0000000 --- a/changes/feature3049 +++ /dev/null @@ -1,6 +0,0 @@ - o Major features: - - Add an __OwningControllerProcess configuration option and a - TAKEOWNERSHIP control-port command, so that a Tor controller can - ensure that when it exits, Tor will shut down. Implements - feature 3049. -