commit 6168d2e975a5712afe91a3b4ba9fba3bcee3a03a Author: Roger Dingledine arma@torproject.org Date: Tue Feb 22 15:00:07 2011 -0500

fold in more changes files --- ChangeLog | 10 ++++++++++ changes/bug1074-part2 | 6 ------ changes/torspec.git | 5 ----- 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog index dcbb6a3..869365c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ Changes in version 0.2.1.30 - 2011-02-?? o Major bugfixes: + - Stop sending a CLOCK_SKEW controller status event whenever + we fetch directory information from a relay that has a wrong clock. + Instead, only inform the controller when it's a trusted authority + that claims our clock is wrong. Bugfix on 0.1.2.6-alpha; fixes + the rest of bug 1074. - Fix a bounds-checking error that could allow an attacker to remotely crash a directory authority. Bugfix on 0.2.1.5-alpha. Found by "piebeer". @@ -21,6 +26,11 @@ Changes in version 0.2.1.30 - 2011-02-?? directory tokens before they have a chance to hit any assertions. Bugfix on 0.2.1.28. Found by "doorss".

+ o Packaging changes: + - Stop shipping the Tor specs files and development proposal documents + in the tarball. They are now in a separate git repository at + git://git.torproject.org/torspec.git +

Changes in version 0.2.1.29 - 2011-01-15 Tor 0.2.1.29 continues our recent code security audit work. The main diff --git a/changes/bug1074-part2 b/changes/bug1074-part2 deleted file mode 100644 index 6644f49..0000000 --- a/changes/bug1074-part2 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes: - - Stop sending a CLOCK_SKEW controller status event whenever - we fetch directory information from a relay that has a wrong clock. - Instead, only inform the controller when it's a trusted authority - that claims our clock is wrong. Bugfix on tor-0.1.2.6-alpha; - fixes the other half of bug 1074. diff --git a/changes/torspec.git b/changes/torspec.git deleted file mode 100644 index ba33ca2..0000000 --- a/changes/torspec.git +++ /dev/null @@ -1,5 +0,0 @@ - o Packaging changes: - - Stop shipping the Tor specs files and development proposal documents - in the tarball. They are now in a separate git repository at - git://git.torproject.org/torspec.git -