URI: 
       tMerge pull request #2940 from SomberNight/2fa_reset_json - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit d940956cfe42339f53b6615a75a2d30ed707b0b1
   DIR parent dcd50c3467d9de778de9d0e4db3836ec84c6d1cc
  HTML Author: ThomasV <thomasv@electrum.org>
       Date:   Wed, 27 Sep 2017 07:24:31 +0200
       
       Merge pull request #2940 from SomberNight/2fa_reset_json
       
       fix json error when resetting 2fa
       Diffstat:
         M plugins/trustedcoin/trustedcoin.py  |       2 +-
       
       1 file changed, 1 insertion(+), 1 deletion(-)
       ---
   DIR diff --git a/plugins/trustedcoin/trustedcoin.py b/plugins/trustedcoin/trustedcoin.py
       t@@ -563,7 +563,7 @@ class TrustedCoinPlugin(BasePlugin):
                    key = regenerate_key(pk)
                    compressed = is_compressed(pk)
                    sig = key.sign_message(message, compressed)
       -            return base64.b64encode(sig)
       +            return base64.b64encode(sig).decode()
        
                signatures = [f(x) for x in [xprv1, xprv2]]
                r = server.reset_auth(short_id, challenge, signatures)