merged RC_1_1 into master

This commit is contained in:
arvidn 2018-07-21 18:38:24 +02:00
commit 6c6dfb3de5
2 changed files with 3 additions and 2 deletions

View File

@ -87,6 +87,8 @@
* resume data no longer has timestamps of files
* require C++11 to build libtorrent
1.1.9 release
* uTP connections are no longer exempt from rate limits by default
* fix exporting files from partfile while seeding
* fix potential deadlock on Windows, caused by performing restricted

View File

@ -12,13 +12,12 @@ version = (int(sys.argv[1]), int(sys.argv[2]), int(sys.argv[3]), int(sys.argv[4]
def v(version):
ret = ()
for i in version:
if i < 9:
if i < 10:
ret = ret + (chr(ord('0') + i),)
else:
ret = ret + (chr(ord('A') + i - 10),)
return ret
revision = os.popen('git log -1 --format=format:%h').read().strip()