[or-cvs] r20598: {projects} please merge weasel's torify changes (projects/todo)

[sebastian at seul.org]

Author: sebastian
Date: 2009-09-17 11:56:14 -0400 (Thu, 17 Sep 2009)
New Revision: 20598

Modified:
   projects/todo/git-branches
Log:
please merge weasel's torify changes

Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2009-09-17 15:38:30 UTC (rev 20597)
+++ projects/todo/git-branches	2009-09-17 15:56:14 UTC (rev 20598)
@@ -1,5 +1,8 @@
 Active branches that the author thinks are ready for merge:
 
+- test that torify still works with tsocks/torsocks installed, then merge
+  sebastian/weasel_torify
+
 o update manpage. it isn't cached-routers anymore
   sebastian/manpage
 
@@ -23,9 +26,6 @@
   sanity-testing
   nickm/bug1094
 
-- test that torify still works with tsocks/torsocks installed, then merge
-  sebastian/weasel_torify
-
 o mikeperry's CircuitBuildTimeout branch needs review and someone
   to comment on the XXX's and advise him how to fix them.
   mikeperry/circuitbuildtimeout