tMerge pull request #2554 from Mqrius/master - electrum - Electrum Bitcoin wallet
 (HTM) git clone https://git.parazyd.org/electrum
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Submodules
       ---
 (DIR) commit b522c4403e1fd176f62e91012d4490c318cedee9
 (DIR) parent df4e81d69016dba93520b452d692f28ac795aed5
 (HTM) Author: ThomasV <thomasv@electrum.org>
       Date:   Tue, 27 Jun 2017 10:59:01 +0200
       
       Merge pull request #2554 from Mqrius/master
       
       Trezor plugin: Sort multisig pubkeys before signing
       Diffstat:
         M plugins/trezor/plugin.py            |       1 +
       
       1 file changed, 1 insertion(+), 0 deletions(-)
       ---
 (DIR) diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py
       t@@ -53,6 +53,7 @@ class TrezorCompatibleKeyStore(Hardware_KeyStore):
                # path of the xpubs that are involved
                xpub_path = {}
                for txin in tx.inputs():
       +            pubkeys, x_pubkeys = tx.get_sorted_pubkeys(txin)
                    tx_hash = txin['prevout_hash']
                    prev_tx[tx_hash] = txin['prev_tx'] 
                    for x_pubkey in txin['x_pubkeys']: