September 2016 - tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 22 Sep '16

22 Sep '16

commit 6cdb7627c0a6534954746281e5a81559203ade5d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 22 18:15:20 2016 +0000 Update translations for https_everywhere --- ar/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd index 3c8605b..7cb8308 100644 --- a/ar/https-everywhere.dtd +++ b/ar/https-everywhere.dtd @@ -20,7 +20,7 @@ <!ENTITY https-everywhere.menu.observatory "خيارات مرصد SSL"> <!ENTITY https-everywhere.menu.globalEnable "فعّل HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "عطّل HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "منع جميع الطلبات الغير مشفرة"> <!ENTITY https-everywhere.menu.showCounter "أظهر العداد"> <!ENTITY https-everywhere.menu.viewAllRules "عرض جميع القواعد"> @@ -50,7 +50,7 @@ <!ENTITY https-everywhere.chrome.show_advanced "اظهار الاعدادت المتقدمه"> <!ENTITY https-everywhere.chrome.hide_advanced "اخفاء الاعدادات المتقدمه"> <!ENTITY https-everywhere.chrome.rule_name "اسم الشرط"> -<!ENTITY https-everywhere.chrome.regex "Matching regex"> +<!ENTITY https-everywhere.chrome.regex "مطابقة regex"> <!ENTITY https-everywhere.chrome.redirect_to "اعادة التوجيه اى"> <!ENTITY https-everywhere.chrome.status_cancel_button "إلغاء">

1 0

[torspec/master] Note TLS link key size and digest change in prop220
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit b2e42644dc39abe6c4960346fd588d8dcd0ab650 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 11:12:20 2016 -0400 Note TLS link key size and digest change in prop220 --- proposals/220-ecc-id-keys.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/proposals/220-ecc-id-keys.txt b/proposals/220-ecc-id-keys.txt index 7a21f20..dd063e8 100644 --- a/proposals/220-ecc-id-keys.txt +++ b/proposals/220-ecc-id-keys.txt @@ -670,3 +670,11 @@ A.5. Reserved numbers 6: TLS authentication key certified by Ed25519 signing key 7: RSA cross-certificate for Ed25519 identity key + +A.6. Related changes + + As we merge this, proposal, we should also extend link key size to + 2048 bits, and use SHA256 as the x509 cert algorithm for our link + keys. This will improve link security, and deliver better + fingerprinting resistence. See proposal 179 for an older discussion + of this issue.

1 0

[torspec/master] correct prop244 and make it more specific
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit 0760e80a360ad1d315b48099f3ebd5e511516b2d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 11:02:40 2016 -0400 correct prop244 and make it more specific --- proposals/244-use-rfc5705-for-tls-binding.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/244-use-rfc5705-for-tls-binding.txt b/proposals/244-use-rfc5705-for-tls-binding.txt index d1a51fe..c4369b3 100644 --- a/proposals/244-use-rfc5705-for-tls-binding.txt +++ b/proposals/244-use-rfc5705-for-tls-binding.txt @@ -21,7 +21,7 @@ Status: Accepted and TYPE field to be determined, that works the same as our current "RSA-SHA256-TLSSecret" authentication, except for these fields: - TYPE is a different constant string. + TYPE is a different constant string, "AUTH0002". TLSSECRETS is replaced by the output of the Exporter function in RFC5705, using as its inputs: @@ -29,10 +29,10 @@ Status: Accepted * The context value equal to the client's identity key digest. * The length 32. - I propose that proposal 224's section on authenticating with ed25519 + I propose that proposal 220's section on authenticating with ed25519 keys be amended accordingly: - TYPE is a different constant string, different from the one above. + TYPE is a different constant string, "AUTH0003". TLSSECRETS is replaced by the output of the Exporter function in RFC5705, using as its inputs:

1 0

[torspec/master] prop264: in consensuses, say "pr" rather than "proto"
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit d881250ff68a7bb77adef7a351790db7ee4c4332 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 10:27:13 2016 -0400 prop264: in consensuses, say "pr" rather than "proto" --- proposals/264-subprotocol-versions.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/proposals/264-subprotocol-versions.txt b/proposals/264-subprotocol-versions.txt index 7f8c4d4..4acc8b3 100644 --- a/proposals/264-subprotocol-versions.txt +++ b/proposals/264-subprotocol-versions.txt @@ -72,7 +72,8 @@ Status: Open "x-" or "X-". Keywords are case-sensitive. During voting, authorities copy these lines immediately below the "v" - lines. When a descriptor does not contain a "proto" entry, the + lines, using "pr" as the keyword instead of "proto". + When a descriptor does not contain a "proto" entry, the authorities should reconstruct it using the approach described below in section A.1. They are included in the consensus using the same rules as currently used for "v" lines, if a sufficiently late @@ -104,7 +105,7 @@ Status: Open inferrable from the v line. Removing all the v lines from the current consensus would save only 1.7% after gzip compression.] -3. Using "proto" and "v" lines +3. Using "proto"/"pr" and "v" lines Whenever possible, clients and relays should use the list of advertised protocols instead of version numbers. Version numbers

1 0

[tor/master] Coverity warning fix: let coverity tell we're closing sockets
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit 0baa276ea9673ba1c7efce009d30a4afb4f63a6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 09:24:56 2016 -0400 Coverity warning fix: let coverity tell we're closing sockets Our use of the (mockable) tor_close_socket() in the util/socket_.. tests confused coverity, which could no longer tell that we were actually closing the sockets. --- src/test/test_util.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 1edfaa9..d2152dd 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5074,24 +5074,28 @@ test_util_socket(void *arg) tt_int_op(fd_is_nonblocking(fd4), OP_EQ, 1); #endif - tor_close_socket(fd1); - tor_close_socket(fd2); + tor_assert(tor_close_socket == tor_close_socket__real); + + /* we use close_socket__real here so that coverity can tell that we are + * really closing these sockets. */ + tor_close_socket__real(fd1); + tor_close_socket__real(fd2); fd1 = fd2 = TOR_INVALID_SOCKET; tt_int_op(get_n_open_sockets(), OP_EQ, n + 2); - tor_close_socket(fd3); - tor_close_socket(fd4); + tor_close_socket__real(fd3); + tor_close_socket__real(fd4); fd3 = fd4 = TOR_INVALID_SOCKET; tt_int_op(get_n_open_sockets(), OP_EQ, n); done: if (SOCKET_OK(fd1)) - tor_close_socket(fd1); + tor_close_socket__real(fd1); if (SOCKET_OK(fd2)) - tor_close_socket(fd2); + tor_close_socket__real(fd2); if (SOCKET_OK(fd3)) - tor_close_socket(fd3); + tor_close_socket__real(fd3); if (SOCKET_OK(fd4)) - tor_close_socket(fd4); + tor_close_socket__real(fd4); } static int

1 0

[bridgedb/develop] Upgrade coverage to version 4.2.
by isis＠torproject.org 22 Sep '16

22 Sep '16

commit 9634930606dbf1c07a5d9a370bf80b62b3631029 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Sep 8 16:51:56 2016 +0000 Upgrade coverage to version 4.2. --- .test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index bd4e741..f48bba3 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -5,7 +5,7 @@ # $ pip install -r .test.requirements.txt # $ make coverage # -coverage==3.7.1 +coverage==4.2 leekspin==1.1.4 mechanize==0.2.5 pep8==1.5.7 diff --git a/.travis.requirements.txt b/.travis.requirements.txt index ebda8e0..c4f6966 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -13,7 +13,7 @@ # $ make coverage # #------------------------------------------------------------------------------ -coverage==3.7.1 +coverage==4.2 coveralls==0.4.2 leekspin==1.1.4 mechanize==0.2.5 diff --git a/setup.py b/setup.py index 189d5b5..97dee01 100644 --- a/setup.py +++ b/setup.py @@ -381,7 +381,7 @@ setuptools.setup( scripts=['scripts/bridgedb', 'scripts/get-tor-exits'], extras_require={'test': ["sure==1.2.2", - "coverage==3.7.1", + "coverage==4.2", "leekspin==1.1.4"]}, zip_safe=False, cmdclass=get_cmdclass(),

1 0

[bridgedb/develop] Use pip --no-binaries :all: for newer versions of pip.
by isis＠torproject.org 22 Sep '16

22 Sep '16

commit 09e6cb3577a06385f5350ba0d5187cb3914e01f3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Sep 8 16:56:27 2016 +0000 Use pip --no-binaries :all: for newer versions of pip. --- scripts/install-dependencies | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/install-dependencies b/scripts/install-dependencies index f9a3a15..189cf53 100755 --- a/scripts/install-dependencies +++ b/scripts/install-dependencies @@ -6,7 +6,17 @@ SUDO= APT_GET=$(which apt-get) APT_FLAGS='-q --no-install-suggests --no-install-recommends' PIP=$(which pip) -PIP_FLAGS='--no-use-wheel' +PIP_FLAGS= + +# If this doesn't work, then the version of pip is very old and we need to use --no-use-wheel +$PIP --no-binaries :all: + +if test "$?" -eq 2 ; then + PIP_FLAGS=$PIP_FLAGS' --no-use-wheel' +else + PIP_FLAGS=$PIP_FLAGS' --no-binaries :all:' +fi + DEPENDS="build-essential openssl sqlite3 python-dev python-setuptools" DEPENDS="${DEPENDS} libgeoip-dev geoip-database libjpeg-dev" HERE=$(dirname $0)

1 0

[bridgedb/develop] Upgrade ipaddr to version 2.1.11.
by isis＠torproject.org 22 Sep '16

22 Sep '16

commit 835f25099ef2b761bf8b9fdfdc9e1c44de5585ee Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Sep 8 16:45:26 2016 +0000 Upgrade ipaddr to version 2.1.11. --- .travis.requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index c4f6966..0c1dc95 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -21,7 +21,7 @@ sure==1.2.2 Babel==0.9.6 BeautifulSoup==3.2.1 Mako==0.8.1 -https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr-2.1.10-py2.7 +ipaddr==2.1.11 pycrypto==2.6.1 pygeoip==0.2.7 gnupg==2.0.1 diff --git a/requirements.txt b/requirements.txt index 4591511..bd25ae4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ Babel==0.9.6 BeautifulSoup==3.2.1 Mako==0.8.1 Twisted==14.0.2 -https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b077b19773d4f1b5f1ef88b26f6650ce0#egg=ipaddr-2.1.10-py2.7 +ipaddr==2.1.11 pycrypto==2.6.1 pyOpenSSL==0.14 pygeoip==0.2.7

1 0

[bridgedb/develop] Coverage 4.2 doesn't understand [report] modules= config option.
by isis＠torproject.org 22 Sep '16

22 Sep '16

commit 0137fb5b202f3623fcc0a30a51e85230ab85e79a Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Sep 8 17:04:55 2016 +0000 Coverage 4.2 doesn't understand [report] modules= config option. --- .coveragerc | 1 - 1 file changed, 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index 04dc0a6..d16f7e2 100644 --- a/.coveragerc +++ b/.coveragerc @@ -5,7 +5,6 @@ branch = True timid = False [report] -modules = bridgedb omit = */_langs* */_version*

1 0

[bridgedb/develop] Add support for bridge descriptors from multiple authorities.
by isis＠torproject.org 22 Sep '16

22 Sep '16

commit ae45f903f260fcc98997793c52919b2d9b289295 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Sep 6 18:33:33 2016 +0000 Add support for bridge descriptors from multiple authorities. * FIXES #20088: https://bugs.torproject.org/20088 --- bridgedb.conf | 4 ++ bridgedb/Main.py | 172 +++++++++++++++++++++++++++----------------------- bridgedb/configure.py | 4 +- requirements.txt | 2 +- 4 files changed, 99 insertions(+), 83 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 52a8ca7..2d73a2b 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -120,6 +120,10 @@ # can read it. #------------------------------------------------------------------------------ +# List of directories which contain versions of the files specified in +# BRIDGE_FILES, EXTRA_INFO_FILES, and STATUS_FILE. +BRIDGE_AUTHORITY_DIRECTORIES = ["from-authority", "from-bifroest"] + # List of filenames from which we read ``@type bridge-server-descriptor``s, on # startup and on SIGHUP. BRIDGE_FILES = ["bridge-descriptors"] diff --git a/bridgedb/Main.py b/bridgedb/Main.py index bf4c213..dc618cb 100644 --- a/bridgedb/Main.py +++ b/bridgedb/Main.py @@ -41,6 +41,12 @@ from bridgedb import Bridges from bridgedb.Stability import updateBridgeHistory +def expandBridgeAuthDir(authdir, filename): + """Expands a descriptor ``filename`` relative to which of the + BRIDGE_AUTHORITY_DIRECTORIES, ``authdir`` it resides within. + """ + return os.path.abspath(os.path.expanduser(os.sep.join([authdir, filename]))) + def load(state, hashring, clear=False): """Read and parse all descriptors, and load into a bridge hashring. @@ -69,95 +75,101 @@ def load(state, hashring, clear=False): if ignoreNetworkstatus: logging.info("Ignoring BridgeAuthority networkstatus documents.") - bridges = {} - timestamps = {} - - logging.info("Opening networkstatus file: %s" % state.STATUS_FILE) - networkstatuses = descriptors.parseNetworkStatusFile(state.STATUS_FILE) - logging.debug("Closing networkstatus file: %s" % state.STATUS_FILE) + for auth in state.BRIDGE_AUTHORITY_DIRECTORIES: + logging.info("Processing descriptors in %s directory..." % auth) - logging.info("Processing networkstatus descriptors...") - for router in networkstatuses: - bridge = Bridge() - bridge.updateFromNetworkStatus(router, ignoreNetworkstatus) - try: - bridge.assertOK() - except MalformedBridgeInfo as error: - logging.warn(str(error)) - else: - bridges[bridge.fingerprint] = bridge + bridges = {} + timestamps = {} - for filename in state.BRIDGE_FILES: - logging.info("Opening bridge-server-descriptor file: '%s'" % filename) - serverdescriptors = descriptors.parseServerDescriptorsFile(filename) - logging.debug("Closing bridge-server-descriptor file: '%s'" % filename) + fn = expandBridgeAuthDir(auth, state.STATUS_FILE) + logging.info("Opening networkstatus file: %s" % fn) + networkstatuses = descriptors.parseNetworkStatusFile(fn) + logging.debug("Closing networkstatus file: %s" % fn) - for router in serverdescriptors: + logging.info("Processing networkstatus descriptors...") + for router in networkstatuses: + bridge = Bridge() + bridge.updateFromNetworkStatus(router, ignoreNetworkstatus) try: - bridge = bridges[router.fingerprint] - except KeyError: - logging.warn( - ("Received server descriptor for bridge '%s' which wasn't " - "in the networkstatus!") % router.fingerprint) - if ignoreNetworkstatus: - bridge = Bridge() - else: + bridge.assertOK() + except MalformedBridgeInfo as error: + logging.warn(str(error)) + else: + bridges[bridge.fingerprint] = bridge + + for filename in state.BRIDGE_FILES: + fn = expandBridgeAuthDir(auth, filename) + logging.info("Opening bridge-server-descriptor file: '%s'" % fn) + serverdescriptors = descriptors.parseServerDescriptorsFile(fn) + logging.debug("Closing bridge-server-descriptor file: '%s'" % fn) + + for router in serverdescriptors: + try: + bridge = bridges[router.fingerprint] + except KeyError: + logging.warn( + ("Received server descriptor for bridge '%s' which wasn't " + "in the networkstatus!") % router.fingerprint) + if ignoreNetworkstatus: + bridge = Bridge() + else: + continue + + try: + bridge.updateFromServerDescriptor(router, ignoreNetworkstatus) + except (ServerDescriptorWithoutNetworkstatus, + MissingServerDescriptorDigest, + ServerDescriptorDigestMismatch) as error: + logging.warn(str(error)) + # Reject any routers whose server descriptors didn't pass + # :meth:`~bridges.Bridge._checkServerDescriptor`, i.e. those + # bridges who don't have corresponding networkstatus + # documents, or whose server descriptor digests don't check + # out: + bridges.pop(router.fingerprint) continue + if state.COLLECT_TIMESTAMPS: + # Update timestamps from server descriptors, not from network + # status descriptors (because networkstatus documents and + # descriptors aren't authenticated in any way): + if bridge.fingerprint in timestamps.keys(): + timestamps[bridge.fingerprint].append(router.published) + else: + timestamps[bridge.fingerprint] = [router.published] + + eifiles = [expandBridgeAuthDir(auth, fn) for fn in state.EXTRA_INFO_FILES] + extrainfos = descriptors.parseExtraInfoFiles(*eifiles) + for fingerprint, router in extrainfos.items(): try: - bridge.updateFromServerDescriptor(router, ignoreNetworkstatus) - except (ServerDescriptorWithoutNetworkstatus, - MissingServerDescriptorDigest, - ServerDescriptorDigestMismatch) as error: + bridges[fingerprint].updateFromExtraInfoDescriptor(router) + except MalformedBridgeInfo as error: logging.warn(str(error)) - # Reject any routers whose server descriptors didn't pass - # :meth:`~bridges.Bridge._checkServerDescriptor`, i.e. those - # bridges who don't have corresponding networkstatus - # documents, or whose server descriptor digests don't check - # out: - bridges.pop(router.fingerprint) - continue - - if state.COLLECT_TIMESTAMPS: - # Update timestamps from server descriptors, not from network - # status descriptors (because networkstatus documents and - # descriptors aren't authenticated in any way): - if bridge.fingerprint in timestamps.keys(): - timestamps[bridge.fingerprint].append(router.published) - else: - timestamps[bridge.fingerprint] = [router.published] - - extrainfos = descriptors.parseExtraInfoFiles(*state.EXTRA_INFO_FILES) - for fingerprint, router in extrainfos.items(): - try: - bridges[fingerprint].updateFromExtraInfoDescriptor(router) - except MalformedBridgeInfo as error: - logging.warn(str(error)) - except KeyError as error: - logging.warn(("Received extrainfo descriptor for bridge '%s', " - "but could not find bridge with that fingerprint.") - % router.fingerprint) - - inserted = 0 - logging.info("Inserting %d bridges into hashring..." % len(bridges)) - for fingerprint, bridge in bridges.items(): - # Skip insertion of bridges which are geolocated to be in one of the - # NO_DISTRIBUTION_COUNTRIES, a.k.a. the countries we don't distribute - # bridges from: - if bridge.country in state.NO_DISTRIBUTION_COUNTRIES: - logging.warn("Not distributing Bridge %s %s:%s in country %s!" % - (bridge, bridge.address, bridge.orPort, bridge.country)) - else: - # If the bridge is not running, then it is skipped during the - # insertion process. - hashring.insert(bridge) - inserted += 1 - logging.info("Done inserting %d bridges into hashring." % inserted) - - if state.COLLECT_TIMESTAMPS: - reactor.callInThread(updateBridgeHistory, bridges, timestamps) + except KeyError as error: + logging.warn(("Received extrainfo descriptor for bridge '%s', " + "but could not find bridge with that fingerprint.") + % router.fingerprint) + + inserted = 0 + logging.info("Inserting %d bridges into hashring..." % len(bridges)) + for fingerprint, bridge in bridges.items(): + # Skip insertion of bridges which are geolocated to be in one of the + # NO_DISTRIBUTION_COUNTRIES, a.k.a. the countries we don't distribute + # bridges from: + if bridge.country in state.NO_DISTRIBUTION_COUNTRIES: + logging.warn("Not distributing Bridge %s %s:%s in country %s!" % + (bridge, bridge.address, bridge.orPort, bridge.country)) + else: + # If the bridge is not running, then it is skipped during the + # insertion process. + hashring.insert(bridge) + inserted += 1 + logging.info("Done inserting %d bridges into hashring." % inserted) + + if state.COLLECT_TIMESTAMPS: + reactor.callInThread(updateBridgeHistory, bridges, timestamps) - state.save() + state.save() def _reloadFn(*args): """Placeholder callback function for :func:`_handleSIGHUP`.""" diff --git a/bridgedb/configure.py b/bridgedb/configure.py index e107a57..6c13595 100644 --- a/bridgedb/configure.py +++ b/bridgedb/configure.py @@ -100,7 +100,7 @@ def loadConfig(configFile=None, configCls=None): # # See :meth:`bridgedb.persistent.State.useUpdatedSettings`. - for attr in ["PROXY_LIST_FILES", "BRIDGE_FILES", "EXTRA_INFO_FILES"]: + for attr in ["PROXY_LIST_FILES"]: setting = getattr(config, attr, None) if setting is None: # pragma: no cover setattr(config, attr, []) # If they weren't set, make them lists @@ -110,7 +110,7 @@ def loadConfig(configFile=None, configCls=None): for attr in ["DB_FILE", "DB_LOG_FILE", "MASTER_KEY_FILE", "PIDFILE", "ASSIGNMENTS_FILE", "HTTPS_CERT_FILE", "HTTPS_KEY_FILE", - "LOG_FILE", "STATUS_FILE", "COUNTRY_BLOCK_FILE", + "LOG_FILE", "COUNTRY_BLOCK_FILE", "GIMP_CAPTCHA_DIR", "GIMP_CAPTCHA_HMAC_KEYFILE", "GIMP_CAPTCHA_RSA_KEYFILE", "EMAIL_GPG_HOMEDIR", "EMAIL_GPG_PASSPHRASE_FILE"]: diff --git a/requirements.txt b/requirements.txt index bd25ae4..26c2c1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,5 +10,5 @@ gnupg==2.0.1 pillow>=2.6.1 qrcode==5.0.1 service_identity==14.0.0 -git+https://git.torproject.org/stem.git@ba8cee36a0348c1509ad3562051723b7948e19ce#egg=stem-1.4.1.dev0-py2.7 +git+https://git.torproject.org/stem.git@152fa89c33114619913d2be13e67adb4e55ce7ab#egg=stem-1.4.1.dev1-py2.7 zope.interface==3.6.1

1 0