Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
dachshund 2013-12-03 18:11:00 -05:00
commit c9ee77ee38
2 changed files with 3 additions and 3 deletions

View file

@ -238,8 +238,8 @@ def __init__(self, average_download_speed):
self.__average_download_speed = average_download_speed #bytes/second
def __str__(self):
return "Average download speed: "+str(self.__average_download_speed)+\
" bytes/second"
return "Download was too slow. Average speed: "+\
str(self.__average_download_speed)+" bytes/second"

View file

@ -39,7 +39,7 @@
# Since the timestamp role does not have signed metadata about itself, we set a
# default but sane upper bound for the number of bytes required to download it.
DEFAULT_TIMESTAMP_REQUIRED_LENGTH = 2048 #bytes
DEFAULT_TIMESTAMP_REQUIRED_LENGTH = 16384 #bytes
# Set a timeout value in seconds (float) for non-blocking socket operations.
SOCKET_TIMEOUT = 1 #seconds