[or-cvs] r21240: {projects} Mark fix-cell-stats as merged. (projects/todo)

[nickm at seul.org]

Author: nickm
Date: 2009-12-16 22:07:43 -0500 (Wed, 16 Dec 2009)
New Revision: 21240

Modified:
   projects/todo/git-branches
Log:
Mark fix-cell-stats as merged.

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-12-17 01:36:52 UTC (rev 21239)
+++ projects/todo/git-branches	2009-12-17 03:07:43 UTC (rev 21240)
@@ -6,14 +6,19 @@
 - Remove v0 hidden service statistics
   karsten/remove-v0hs-stats
 
-- Minor fix to buffer stats
+o Minor fix to buffer stats
   karsten/fix-cell-stats
+  [merged 16 Dec 2009 by nickm]
 
 - Fix bridge stats
   karsten/fix-bridge-stats-master
 
 Active branches that want more attention before merging:
 
+- Revised version of Ian and Can's circuit priority code.
+  - Needs testing for switch-on/switch-off logic.
+  nickm/ewma
+
 - Make the ?? country explicitly listable in torrc.  Needs review and
   sanity-testing
   nickm/bug1094