[minion-cvs] Apply patches from George Danezis

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria:/tmp/cvs-serv3934

Modified Files:
	ClientAPI.py ClientDirectory.py 
Log Message:
Apply patches from George Danezis

Index: ClientAPI.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientAPI.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ClientAPI.py	24 May 2005 17:27:44 -0000	1.6
+++ ClientAPI.py	27 May 2005 18:17:38 -0000	1.7
@@ -28,6 +28,8 @@
 
 import mixminion.Config
 import mixminion.ClientUtils
+import mixminion.ClientDirectory
+import os
 
 # The operations in this file raise 'MixError' on failure.
 from mixminion.Common import MixError
@@ -106,7 +108,8 @@
         self._fragmentPool = None
         self._logHandler = None
         self._statusLogHandler = None
-
+        self._clientDirectory = None
+        
     # ------------------------------------------------------------
     # Configuration functions
     def loadConfig(self, location=None):

Index: ClientDirectory.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientDirectory.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- ClientDirectory.py	3 May 2005 03:31:40 -0000	1.47
+++ ClientDirectory.py	27 May 2005 18:17:38 -0000	1.48
@@ -891,7 +891,7 @@
 
     def getAllNicknames(self):
         """DOCDOC"""
-        lst = self.byNicknames.keys()
+        lst = self.byNickname.keys()
         lst.sort()
         return lst