[or-cvs] r20372: {projects} Note three merged branches (projects/todo)

[nickm@xxxxxxxx]

Author: nickm
Date: 2009-08-26 15:03:17 -0400 (Wed, 26 Aug 2009)
New Revision: 20372

Modified:
   projects/todo/git-branches
Log:
Note three merged branches

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-08-26 17:42:30 UTC (rev 20371)
+++ projects/todo/git-branches	2009-08-26 19:03:17 UTC (rev 20372)
@@ -19,9 +19,11 @@
 
 - Include the git version where the svn revision used to be
   nickm/gitversion
+  [Merged to master; candidate for maint-0.2.1]
 
-- Merge Christopher Davis's outgoing SOCKS code.
+o Merge Christopher Davis's outgoing SOCKS code.
   nickm/socks-client
+  [merged to master]
 
 - Wyllys Ingersoll's support for AES on some Solaris versions
   nickm/solaris-aes
@@ -47,9 +49,10 @@
   - Better removed .exit support
     nickm/more.exit
 
-- Remove configure options for exit/entry/cell/dirreq stats, include stats
+o Remove configure options for exit/entry/cell/dirreq stats, include stats
   in extra-info documents (implements proposal 166)
   karsten/proposal-166-impl-master
+  [merged to master]
 
 - Dump unparseable descriptors to disk; helps diagnosing 1051
   karsten/fix-1051-file2-maint-0.2.1