diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-09-29 17:21:43 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-09-29 17:21:43 -0400 |
| commit | 355fc63790bedfd00c062d6aa8d60f00307dc03f (patch) | |
| tree | 4d8f31bc6d0658ea08e9651bde3655dc8b3e266d /changes | |
| parent | 50720a9a4f8ea4433f3696d42d2f640ad970b285 (diff) | |
| parent | 48cd096276590e40540bc255b2610931351b14cb (diff) | |
| download | tor-355fc63790bedfd00c062d6aa8d60f00307dc03f.tar.gz tor-355fc63790bedfd00c062d6aa8d60f00307dc03f.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug1739 | 4 | ||||
| -rw-r--r-- | changes/bug1740 | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug1739 b/changes/bug1739 new file mode 100644 index 0000000000..ec1b1b1b5c --- /dev/null +++ b/changes/bug1739 @@ -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. diff --git a/changes/bug1740 b/changes/bug1740 new file mode 100644 index 0000000000..2e7769b0d6 --- /dev/null +++ b/changes/bug1740 @@ -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. |