Merge branch 'stable' into beta

Gallopsled · Sep 18, 2016 · 254958b · 254958b
2 parents 6ebcc6f + 1cb4722
commit 254958b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis_install.sh b/.travis_install.sh
@@ -32,7 +32,7 @@ setup_travis()
     if [ ! -f usr/lib/libbfd-2.22-multiarch.so ];
     then
         # Install the multiarch binutils
-        local_deb_extract http://mirrors.mit.edu/ubuntu/ubuntu/pool/universe/b/binutils/binutils-multiarch_2.22-6ubuntu1_amd64.deb
+        local_deb_extract http://mirrors.mit.edu/ubuntu/pool/universe/b/binutils/binutils-multiarch_2.22-6ubuntu1_amd64.deb
         pushd usr/lib
         ln -sf libbfd-2.22-multiarch.so libbfd-2.22.so
         ln -sf libopcodes-2.22-multiarch.so libopcodes-2.22.so

diff --git a/pwnlib/update.py b/pwnlib/update.py
@@ -45,7 +45,7 @@ def available_on_github(prerelease=current_version.is_prerelease):
     url = 'https://api.github.com/repos/%s/tags' % package_repo
 
     with context.quiet:
-        tags = json.loads(wget(url))
+        tags = json.loads(wget(url, timeout = 60))
 
     # 'pwntools-ancient' is a tag, but not a valid version.
     # Handle this here, and for all potential tags which cause