[or-cvs] r20579: {projects} mention bug1094 branch (projects/todo)

[nickm at seul.org]

Author: nickm
Date: 2009-09-15 14:01:15 -0400 (Tue, 15 Sep 2009)
New Revision: 20579

Modified:
   projects/todo/git-branches
Log:
mention bug1094 branch

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-09-15 15:39:56 UTC (rev 20578)
+++ projects/todo/git-branches	2009-09-15 18:01:15 UTC (rev 20579)
@@ -17,6 +17,10 @@
 
 Active branches that want more attention before merging:
 
+- Make the ?? country explicitly listable in torrc.  Needs review and
+  sanity-testing
+  nickm/bug1094
+
 - test that torify still works with tsocks/torsocks installed, then merge
   sebastian/weasel_torify
 
@@ -57,6 +61,9 @@
 - Nick's bufferevent branch: add support for Libevent's bufferevents.
   nickm/bufferevent
 
+- Nick's mivcrodescriptor code
+  nickm/microdesc
+
 - Updated Linux QoS scripts (still have a couple more changes to go)
   mikeperry/linux-qos