Merge branch 'socks-support' into merged

12 years ago · 0cee420c1e
1 changed files with 1 additions and 0 deletions
--- a/setup.py
+++ b/setup.py
@ -55,6 +55,7 @@ setup(name = "Electrum",
                  'electrum.qrscanner',
                  'electrum.history_widget',
                  'electrum.simple_config',
                  'electrum.socks',
                  'electrum.bmp',
                  'electrum.msqr',
                  'electrum.util',