Merge branch 'update-cryptography'

This commit is contained in:
Jack Robison 2018-08-03 12:52:47 -04:00
commit 6eaf1ac2a0
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 2 additions and 1 deletions

View file

@ -32,6 +32,7 @@ at anytime.
* attempt blob downloads from http mirror sources (by default) concurrently to p2p sources * attempt blob downloads from http mirror sources (by default) concurrently to p2p sources
* replace miniupnpc with [txupnp](https://github.com/lbryio/txupnp). Since txupnp is still under development, it will internally fall back to miniupnpc. * replace miniupnpc with [txupnp](https://github.com/lbryio/txupnp). Since txupnp is still under development, it will internally fall back to miniupnpc.
* simplified test_misc.py in the functional tests * simplified test_misc.py in the functional tests
* update `cryptography` requirement to 2.3
### Added ### Added
* `skipped_components` list to the response from `status` * `skipped_components` list to the response from `status`

View file

@ -1,6 +1,6 @@
certifi==2018.4.16 certifi==2018.4.16
Twisted==16.6.0 Twisted==16.6.0
cryptography==2.2.2 cryptography==2.3
appdirs==1.4.3 appdirs==1.4.3
argparse==1.2.1 argparse==1.2.1
docopt==0.6.2 docopt==0.6.2