[or-cvs] r20703: {projects} i merged these two (projects/todo)

[arma at seul.org]

Author: arma
Date: 2009-09-29 16:19:24 -0400 (Tue, 29 Sep 2009)
New Revision: 20703

Modified:
   projects/todo/git-branches
Log:
i merged these two


Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-09-29 19:21:54 UTC (rev 20702)
+++ projects/todo/git-branches	2009-09-29 20:19:24 UTC (rev 20703)
@@ -1,6 +1,6 @@
 Active branches that the author thinks are ready for merge:
 
-- merge weasel's debian branch at tag debian-tor-0.2.2.3-alpha-1 into master.
+o merge weasel's debian branch at tag debian-tor-0.2.2.3-alpha-1 into master.
   repository at git://git.torproject.org/~weasel/git/tor
 
 o torify survived my few tests, we should try to get it into 0.2.2.2
@@ -65,7 +65,7 @@
   Tors can read params from the consensus and change their
   behavior. Mostly taken from 381766ce4b1. Should write a patch.
 
-- Fix an issue with including stats in extra-info descriptors.
+o Fix an issue with including stats in extra-info descriptors.
   karsten/fix-another-stats-bug [merge to master only]
 
 Works in progress; keep an eye out on these: