[or-cvs] r22608: {projects} Update my git branches. (projects/todo)

[Karsten Loesing]

Author: kloesing
Date: 2010-07-06 13:17:11 +0000 (Tue, 06 Jul 2010)
New Revision: 22608

Modified:
   projects/todo/git-branches
Log:
Update my git branches.


Modified: projects/todo/git-branches
===================================================================
--- projects/todo/git-branches	2010-07-06 05:26:34 UTC (rev 22607)
+++ projects/todo/git-branches	2010-07-06 13:17:11 UTC (rev 22608)
@@ -1,8 +1,13 @@
 Active branches that the author thinks are ready for merge:
 
-- Make directory mirrors report non-zero dirreq-v[23]-shares again.
-  karsten/fix-1564
+- Allow enabling or disabling *Statistics while Tor is running. This patch
+  comes with a lot of refactoring and may require some careful reviewing.
+  Once this code is in, we can turn on *Statistics by default.
+  karsten/stats
 
+- Update to July 1 2010 Maxmind GeoLite Country database.
+  karsten/update-geoip-july-2010
+
 - Fix copy-and-paste fail in dir-spec.txt.
   karsten/dir-spec-fix