[or-cvs] r22500: {projects} Add a new branch for arma or nickm to merge. (projects/todo)

[Karsten Loesing <karsten.loesing@xxxxxxx>]

Author: kloesing
Date: 2010-06-10 20:36:18 +0000 (Thu, 10 Jun 2010)
New Revision: 22500

Modified:
   projects/todo/git-branches
Log:
Add a new branch for arma or nickm to merge.


Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2010-06-10 03:24:45 UTC (rev 22499)
+++ projects/todo/git-branches	2010-06-10 20:36:18 UTC (rev 22500)
@@ -1,7 +1,7 @@
 Active branches that the author thinks are ready for merge:
 
-- Update to June 1 2010 Maxmind GeoLite Country database
-  karsten/update-geoip-june-2010
+- Add maatuska as eighth v3 directory authority
+  karsten/maatuska-new-v3auth
 
 - Add an option to disable warnings when Tor gets only an IP address
   sebastian/hostnamewarn