Merge branch 'maint-0.2.1' into maint-0.2.2

This commit is contained in:
Roger Dingledine
2011-02-11 01:20:47 -05:00
2 changed files with 10 additions and 3 deletions
+6
View File
@@ -0,0 +1,6 @@
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.