merge upstream, fix setup.py conflict

2015-02-04 16:03:03 +02:00
parent 090816998e 19d7a81d70
commit ab6837485f
35 changed files with 452 additions and 317 deletions
--- a/setup.py
+++ b/setup.py
@@ -65,14 +65,15 @@ setup(
    name="Electrum",
    version=version.ELECTRUM_VERSION,
    install_requires=[
-        'slowaes',
+        'slowaes>=0.1a1',
        'ecdsa>=0.9',
        'pbkdf2',
        'requests',
-        'pyasn1',
        'pyasn1-modules',
+        'pyasn1',
        'qrcode',
        'SocksiPy-branch',
+        'protobuf',
        'tlslite',
        'dnspython'
    ],