[or-cvs] r21443: {projects} bug 1196 fix is merged, please now merge bug 1198 fix (projects/todo)

[Sebastian Hahn <tor-svn-commits@xxxxxxxxxxxxxxxxx>]

Author: sebastian
Date: 2010-01-19 04:10:11 +0000 (Tue, 19 Jan 2010)
New Revision: 21443

Modified:
   projects/todo/git-branches
Log:
bug 1196 fix is merged, please now merge bug 1198 fix

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2010-01-19 00:49:24 UTC (rev 21442)
+++ projects/todo/git-branches	2010-01-19 04:10:11 UTC (rev 21443)
@@ -1,7 +1,7 @@
 Active branches that the author thinks are ready for merge:
 
-- Log at level notice whenever we get a new control connection
-  sebastian/bug1196
+- Fix bug 1198
+  sebastian/mlock
 
 Active branches that want more attention before merging: