Merge remote-tracking branch 'upstream/master'
[electrum-server.git] / transports / __init__.py