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 0ab0e6757a - Show all commits

View File

@ -59,6 +59,12 @@ def connectToStream(streamNumber):
maximumNumberOfHalfOpenConnections = 9 maximumNumberOfHalfOpenConnections = 9
else: else:
maximumNumberOfHalfOpenConnections = 64 maximumNumberOfHalfOpenConnections = 64
try:
# don't overload Tor
if shared.config.get('bitmessagesettings', 'socksproxytype') != 'none':
maximumNumberOfHalfOpenConnections = 4
except:
pass
for i in range(maximumNumberOfHalfOpenConnections): for i in range(maximumNumberOfHalfOpenConnections):
a = outgoingSynSender() a = outgoingSynSender()
a.setup(streamNumber, selfInitiatedConnections) a.setup(streamNumber, selfInitiatedConnections)