[or-cvs] r20636: {projects} Note a merge and a couple of interesting branches (one of th (projects/todo)

[nickm@xxxxxxxx]

Author: nickm
Date: 2009-09-21 16:11:59 -0400 (Mon, 21 Sep 2009)
New Revision: 20636

Modified:
   projects/todo/git-branches
Log:
Note a merge and a couple of interesting branches (one of them mine, one of them roger's

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-09-21 19:39:04 UTC (rev 20635)
+++ projects/todo/git-branches	2009-09-21 20:11:59 UTC (rev 20636)
@@ -1,7 +1,8 @@
 Active branches that the author thinks are ready for merge:
 
-- merge weasel's debian branch at tag debian-tor-0.2.2.2-alpha-1 into master.
+o merge weasel's debian branch at tag debian-tor-0.2.2.2-alpha-1 into master.
   repository at git://git.torproject.org/~weasel/git/tor
+  [Merged 21 Sep 2009.]
 
 o torify survived my few tests, we should try to get it into 0.2.2.2
   sebastian/weasel_torify
@@ -70,9 +71,14 @@
 - Nick's bufferevent branch: add support for Libevent's bufferevents.
   nickm/bufferevent
 
-- Nick's mivcrodescriptor code
+- Nick's microdescriptor code
   nickm/microdesc
 
 - Updated Linux QoS scripts (still have a couple more changes to go)
   mikeperry/linux-qos
 
+- Nick's work on moving the unit tests to tinytest
+  nickm/tinytest
+
+- Roger's work on improved ExcludeNodes support (bug 1090)
+  arma/strictnodes