summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-02-22 15:00:07 -0500
committerRoger Dingledine <arma@torproject.org>2011-02-22 15:00:07 -0500
commit6168d2e975a5712afe91a3b4ba9fba3bcee3a03a (patch)
treeb9664920ec50828f99c19c4a9cd2386f12103c31
parentf59cad68dc0cc9c567508f5f7de01f492f20ee0c (diff)
downloadtor-6168d2e975a5712afe91a3b4ba9fba3bcee3a03a.tar.gz
tor-6168d2e975a5712afe91a3b4ba9fba3bcee3a03a.zip
fold in more changes files
-rw-r--r--ChangeLog10
-rw-r--r--changes/bug1074-part26
-rw-r--r--changes/torspec.git5
3 files changed, 10 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index dcbb6a3438..869365ca74 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 6644f496d7..0000000000
--- 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 ba33ca20fd..0000000000
--- 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
-