[Pkg-bitcoin-commits] [electrum] 06/24: Merge tag 'upstream/2.4.2'

Tristan Seligmann mithrandi at moszumanska.debian.org
Sun Aug 23 22:44:03 UTC 2015


This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository electrum.

commit 7a2b0879b77972143bb2dba306c9f6df37635570
Merge: b3e07cb dfcf772
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Tue Aug 18 20:13:06 2015 +0200

    Merge tag 'upstream/2.4.2'
    
    Upstream version 2.4.2
    
    # gpg: Signature made Tue 18 Aug 2015 20:12:57 SAST
    # gpg:                using RSA key 0x58C0FB1CDE3B7600
    # gpg: Good signature from "Tristan Seligmann <mithrandi at mithrandi.net>" [ultimate]
    # gpg:                 aka "Tristan Seligmann <mithrandi at debian.org>" [ultimate]
    # gpg:                 aka "Tristan Seligmann <mithrandi at keybase.io>" [ultimate]
    # gpg: Signature notation: issuer-fpr at notations.openpgp.fifthhorseman.net=DB24E315EDAAAC13D646709958C0FB1CDE3B7600
    # Primary key fingerprint: DB24 E315 EDAA AC13 D646  7099 58C0 FB1C DE3B 7600

 Electrum.egg-info/PKG-INFO                         |    2 +-
 Electrum.egg-info/SOURCES.txt                      |   69 +-
 Electrum.egg-info/requires.txt                     |    1 -
 PKG-INFO                                           |    2 +-
 README                                             |   54 -
 README.rst                                         |   61 +
 RELEASE-NOTES                                      |   76 +-
 electrum                                           |   54 +-
 gui/android.py                                     |   11 +-
 gui/gtk.py                                         |   13 +-
 gui/qt/__init__.py                                 |    4 +-
 gui/qt/amountedit.py                               |    7 +
 gui/qt/history_widget.py                           |   51 +-
 gui/qt/icons_rc.py                                 | 3259 +++++++++++++++++---
 gui/qt/installwizard.py                            |  155 +-
 gui/qt/lite_window.py                              |   17 +-
 gui/qt/main_window.py                              |  832 +++--
 gui/qt/paytoedit.py                                |   58 +-
 gui/qt/transaction_dialog.py                       |  147 +-
 gui/qt/util.py                                     |   15 +
 gui/stdio.py                                       |    2 +-
 gui/text.py                                        |    2 +-
 icons.qrc                                          |   24 +-
 icons/seal.png                                     |  Bin 0 -> 38276 bytes
 icons/trezor.png                                   |  Bin 0 -> 2423 bytes
 lib/__init__.py                                    |    2 +-
 lib/account.py                                     |   45 +-
 lib/asn1tinydecoder.py                             |   47 +
 lib/bitcoin.py                                     |   84 +-
 lib/blockchain.py                                  |  190 +-
 lib/commands.py                                    |   82 +-
 lib/contacts.py                                    |   62 +
 lib/daemon.py                                      |   39 +-
 lib/dnssec.py                                      |  258 ++
 lib/interface.py                                   |   78 +-
 lib/locale/ar_SA/LC_MESSAGES/electrum.mo           |  Bin 35480 -> 35480 bytes
 lib/locale/bg_BG/LC_MESSAGES/electrum.mo           |  Bin 43843 -> 43843 bytes
 lib/locale/cs_CZ/LC_MESSAGES/electrum.mo           |  Bin 33456 -> 33456 bytes
 lib/locale/da_DK/LC_MESSAGES/electrum.mo           |  Bin 33429 -> 33385 bytes
 lib/locale/de_DE/LC_MESSAGES/electrum.mo           |  Bin 34080 -> 34180 bytes
 lib/locale/el_GR/LC_MESSAGES/electrum.mo           |  Bin 32196 -> 47465 bytes
 lib/locale/eo_UY/LC_MESSAGES/electrum.mo           |  Bin 32205 -> 32205 bytes
 lib/locale/es_ES/LC_MESSAGES/electrum.mo           |  Bin 34274 -> 34274 bytes
 lib/locale/fr_FR/LC_MESSAGES/electrum.mo           |  Bin 35304 -> 35316 bytes
 lib/locale/hu_HU/LC_MESSAGES/electrum.mo           |  Bin 33049 -> 33047 bytes
 lib/locale/hy_AM/LC_MESSAGES/electrum.mo           |  Bin 32213 -> 32213 bytes
 lib/locale/id_ID/LC_MESSAGES/electrum.mo           |  Bin 33232 -> 33753 bytes
 lib/locale/it_IT/LC_MESSAGES/electrum.mo           |  Bin 34023 -> 34023 bytes
 lib/locale/ja_JP/LC_MESSAGES/electrum.mo           |  Bin 37578 -> 37794 bytes
 lib/locale/ky_KG/LC_MESSAGES/electrum.mo           |  Bin 32888 -> 32888 bytes
 lib/locale/lv_LV/LC_MESSAGES/electrum.mo           |  Bin 33929 -> 33929 bytes
 lib/locale/nb_NO/LC_MESSAGES/electrum.mo           |  Bin 32326 -> 32436 bytes
 lib/locale/nl_NL/LC_MESSAGES/electrum.mo           |  Bin 33630 -> 33630 bytes
 lib/locale/pl_PL/LC_MESSAGES/electrum.mo           |  Bin 33103 -> 33531 bytes
 lib/locale/pt_BR/LC_MESSAGES/electrum.mo           |  Bin 32674 -> 32674 bytes
 lib/locale/pt_PT/LC_MESSAGES/electrum.mo           |  Bin 34170 -> 34330 bytes
 lib/locale/ro_RO/LC_MESSAGES/electrum.mo           |  Bin 32226 -> 32226 bytes
 lib/locale/ru_RU/LC_MESSAGES/electrum.mo           |  Bin 43891 -> 43883 bytes
 lib/locale/sk_SK/LC_MESSAGES/electrum.mo           |  Bin 33727 -> 33727 bytes
 lib/locale/sl_SI/LC_MESSAGES/electrum.mo           |  Bin 32175 -> 32175 bytes
 lib/locale/ta_IN/LC_MESSAGES/electrum.mo           |  Bin 33468 -> 33468 bytes
 lib/locale/th_TH/LC_MESSAGES/electrum.mo           |  Bin 32188 -> 32188 bytes
 lib/locale/vi_VN/LC_MESSAGES/electrum.mo           |  Bin 32459 -> 32459 bytes
 lib/locale/zh_CN/LC_MESSAGES/electrum.mo           |  Bin 31178 -> 31178 bytes
 lib/network.py                                     |  152 +-
 lib/network_proxy.py                               |   27 +-
 lib/paymentrequest.py                              |  294 +-
 {packages/tlslite/utils => lib}/pem.py             |   82 +-
 lib/plugins.py                                     |    2 -
 lib/rsakey.py                                      |  517 ++++
 lib/synchronizer.py                                |  306 +-
 lib/tests/test_bitcoin.py                          |   50 +-
 lib/tests/test_interface.py                        |   24 +
 lib/tests/test_ripemd.py                           |   16 +
 lib/tests/test_util.py                             |   37 +-
 lib/transaction.py                                 |  114 +-
 lib/util.py                                        |  112 +-
 lib/verifier.py                                    |    2 +-
 lib/version.py                                     |    4 +-
 lib/wallet.py                                      |  397 +--
 lib/websockets.py                                  |  142 +
 lib/wordlist/french.txt                            | 1739 -----------
 lib/www/index.html                                 |   46 +-
 lib/x509.py                                        |  160 +-
 packages/tlslite/__init__.py                       |   28 -
 packages/tlslite/api.py                            |   31 -
 packages/tlslite/basedb.py                         |  130 -
 packages/tlslite/checker.py                        |   77 -
 packages/tlslite/constants.py                      |  327 --
 packages/tlslite/errors.py                         |  172 --
 packages/tlslite/extensions.py                     |  575 ----
 packages/tlslite/handshakesettings.py              |  179 --
 packages/tlslite/integration/__init__.py           |   13 -
 packages/tlslite/integration/asyncstatemachine.py  |  238 --
 packages/tlslite/integration/clienthelper.py       |  122 -
 packages/tlslite/integration/httptlsconnection.py  |  112 -
 packages/tlslite/integration/imap4_tls.py          |   96 -
 packages/tlslite/integration/pop3_tls.py           |   84 -
 packages/tlslite/integration/smtp_tls.py           |   78 -
 .../tlslite/integration/tlsasyncdispatchermixin.py |  145 -
 .../tlslite/integration/tlssocketservermixin.py    |   62 -
 packages/tlslite/integration/xmlrpcserver.py       |   55 -
 packages/tlslite/integration/xmlrpctransport.py    |  133 -
 packages/tlslite/mathtls.py                        |  151 -
 packages/tlslite/messages.py                       |  687 -----
 packages/tlslite/session.py                        |  126 -
 packages/tlslite/sessioncache.py                   |  109 -
 packages/tlslite/tlsconnection.py                  | 1754 -----------
 packages/tlslite/tlsrecordlayer.py                 | 1164 -------
 packages/tlslite/utils/__init__.py                 |   29 -
 packages/tlslite/utils/aes.py                      |   34 -
 packages/tlslite/utils/asn1parser.py               |   42 -
 packages/tlslite/utils/cipherfactory.py            |  102 -
 packages/tlslite/utils/codec.py                    |   94 -
 packages/tlslite/utils/compat.py                   |   87 -
 packages/tlslite/utils/cryptomath.py               |  309 --
 packages/tlslite/utils/datefuncs.py                |   77 -
 packages/tlslite/utils/keyfactory.py               |  191 --
 packages/tlslite/utils/openssl_aes.py              |   52 -
 packages/tlslite/utils/openssl_rc4.py              |   28 -
 packages/tlslite/utils/openssl_rsakey.py           |  136 -
 packages/tlslite/utils/openssl_tripledes.py        |   47 -
 packages/tlslite/utils/pycrypto_aes.py             |   29 -
 packages/tlslite/utils/pycrypto_rc4.py             |   28 -
 packages/tlslite/utils/pycrypto_rsakey.py          |   42 -
 packages/tlslite/utils/pycrypto_tripledes.py       |   29 -
 packages/tlslite/utils/python_aes.py               |   69 -
 packages/tlslite/utils/python_rc4.py               |   41 -
 packages/tlslite/utils/python_rsakey.py            |  137 -
 packages/tlslite/utils/rc4.py                      |   19 -
 packages/tlslite/utils/rijndael.py                 |  384 ---
 packages/tlslite/utils/rsakey.py                   |  258 --
 packages/tlslite/utils/tackwrapper.py              |   11 -
 packages/tlslite/utils/tripledes.py                |   27 -
 packages/tlslite/verifierdb.py                     |   95 -
 packages/tlslite/x509.py                           |  110 -
 packages/tlslite/x509certchain.py                  |   91 -
 plugins/__init__.py                                |   23 +-
 plugins/audio_modem.py                             |    6 +-
 plugins/btchipwallet.py                            |  286 +-
 plugins/cosigner_pool.py                           |   11 +-
 plugins/email_requests.py                          |  219 ++
 plugins/exchange_rate.py                           |   12 +-
 plugins/greenaddress_instant.py                    |    5 +-
 plugins/labels.py                                  |    8 +-
 plugins/openalias.py                               |  297 --
 plugins/plot.py                                    |   12 +-
 plugins/trezor.py                                  |  419 +--
 plugins/trustedcoin.py                             |   64 +-
 scripts/authenticator.py                           |    2 +-
 scripts/check_hist                                 |   22 +-
 scripts/check_hist~                                |    2 +-
 scripts/estimate_fee                               |    2 +-
 scripts/peers                                      |    4 +-
 scripts/util.pyc                                   |  Bin 2207 -> 2207 bytes
 setup.py                                           |    1 -
 test.py                                            |   22 -
 157 files changed, 7021 insertions(+), 13668 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/electrum.git



More information about the Pkg-bitcoin-commits mailing list