merge latest upstream

This commit is contained in:
nimdahk 2013-07-29 21:44:39 -04:00
parent 0780ac4787
commit ec87aa6d81

View File

@ -74,6 +74,8 @@ class singleWorker(threading.Thread):
self.doPOWForMyV2Pubkey(data)
elif command == 'sendOutOrStoreMyV3Pubkey':
self.sendOutOrStoreMyV3Pubkey(data)
elif command == 'checkChanPrivacy':
self.checkChanPrivacy(data)
"""elif command == 'newpubkey':
toAddressVersion,toStreamNumber,toRipe = data
if toRipe in shared.neededPubkeys: