V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Showing only changes of commit 4dbd444053 - Show all commits

View File

@ -899,10 +899,10 @@ class singleWorker(threading.Thread, StoppableThread):
payload += encodeVarint(streamNumber) payload += encodeVarint(streamNumber)
if addressVersionNumber <= 3: if addressVersionNumber <= 3:
payload += ripe payload += ripe
logger.info('making request for pubkey with ripe:', ripe.encode('hex')) logger.info('making request for pubkey with ripe: %s', ripe.encode('hex'))
else: else:
payload += tag payload += tag
logger.info('making request for v4 pubkey with tag:', tag.encode('hex')) logger.info('making request for v4 pubkey with tag: %s', tag.encode('hex'))
# print 'trial value', trialValue # print 'trial value', trialValue
statusbar = 'Doing the computations necessary to request the recipient\'s public key.' statusbar = 'Doing the computations necessary to request the recipient\'s public key.'