Merge branch 'maint-0.2.2'

This commit is contained in:
Roger Dingledine
2010-09-29 17:21:43 -04:00
9 changed files with 96 additions and 31 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes:
- Fix to resume generating CIRC FAILED REASON=TIMEOUT control port
messages, which were disabled by the circuit build timeout changes
in 0.2.2.14-alpha. Bugfix on 0.2.2.14-alpha; fixes bug #1739.
+5
View File
@@ -0,0 +1,5 @@
o Minor bugfixes:
- Fix to ignore cannibalized circuits when recording circuit build times.
This should provide for a minor performance improvement for hidden
service users using 0.2.2.14-alpha, and should remove two spurious
notice log messages. Bugfix on 0.2.2.14-alpha; fixes bug #1740.