January 2017 - tor-commits - lists.torproject.org

[tor/master] fixup! Fix unit test failures in response to DNS hijacking.
by nickm＠torproject.org 04 Jan '17

04 Jan '17

commit f4ebbf756787d49a3ccfaaad0fffba5fc9fa4915 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 4 09:03:41 2017 -0500 fixup! Fix unit test failures in response to DNS hijacking. --- src/test/test_options.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 3fe0dc3..29ec1e9 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -649,7 +649,6 @@ test_options_validate__authdir(void *ignored) int ret; char *msg; setup_capture_of_logs(LOG_INFO); - // XXXX But it _can_ exist, if you're DNS-hijacked. options_test_data_t *tdata = get_options_test_data( "AuthoritativeDirectory 1\n" "Address this.should.not!exist!.example.org");

1 0

[metrics-base/master] Corrected source-jar contents,
by karsten＠torproject.org 04 Jan '17

04 Jan '17

commit f31e65829dc570a6283895cab77bade6cda2fa83 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jan 4 12:58:10 2017 +0100 Corrected source-jar contents, enabled additonal target execution before signing using a new property, and cleaned up jar-task. --- java/base.xml | 33 ++++++++++++++++++++++----------- java/build.xml.template | 5 +++++ 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/java/base.xml b/java/base.xml index 0658cdb..5899ec2 100644 --- a/java/base.xml +++ b/java/base.xml @@ -28,6 +28,7 @@ value="${dist}/${name}-${release.version}.tar.gz" /> <property file="build.properties" /> <property name="emptymanifest" value="${generated}/emptymanifest" /> + <property name="tardepends" value="" />  <path id="classpath"> @@ -242,22 +243,28 @@ </condition> <antcall target="jarring" > <param name="destfile" value="${dist}/${jarfile}" /> - <param name="usepath" value="${libs}" /> - <param name="usepattern" value="${jarpattern}" /> <param name="usebase" value="${classes}" /> + <param name="usepath" value="${sources}" /> + <param name="usepattern" value="empty" /> + <param name="uselibpath" value="${libs}" /> + <param name="uselibpattern" value="${jarpattern}" /> </antcall> <property name="manifestfile" value="${emptymanifest}" /> <antcall target="jarring" > <param name="destfile" value="${dist}/${jarsourcesfile}" /> - <param name="usepath" value="${libs}" /> - <param name="usepattern" value="empty" /> - <param name="usebase" value="${basedir}/src" /> + <param name="usebase" value="${testsources}" /> + <param name="usepath" value="${sources}" /> + <param name="usepattern" value="**/*.java" /> + <param name="uselibpath" value="${libs}" /> + <param name="uselibpattern" value="empty" /> </antcall> <antcall target="jarring" > <param name="destfile" value="${dist}/${jardocsfile}" /> - <param name="usepath" value="${libs}" /> - <param name="usepattern" value="empty" /> <param name="usebase" value="${docs}" /> + <param name="usepath" value="${docs}" /> + <param name="usepattern" value="*" /> + <param name="uselibpath" value="${libs}" /> + <param name="uselibpattern" value="empty" /> </antcall> </target> @@ -272,13 +279,13 @@ </not> <archives> <zips> - <fileset dir="${usepath}"> - <patternset refid="${usepattern}" /> + <fileset dir="${uselibpath}"> + <patternset refid="${uselibpattern}" /> </fileset> </zips> </archives> </restrict> - + <fileset dir="${usepath}" includes="${usepattern}" /> <manifest> <attribute name="Created-By" value="The Tor Project" /> <attribute name="Implementation-Title" value="${implementation-title}"/> @@ -288,7 +295,7 @@ </jar> </target> - <target name="signall" depends="jar"> + <target name="signall" depends="other,jar"> <condition property="tobesigned" value="${jarfile} ${jarsourcesfile} ${jardocsfile} ${additional2sign}" else="${jarfile} ${jarsourcesfile} ${jardocsfile}" > @@ -326,6 +333,10 @@ </target> + <target name="other" if="tardepends" > + <antcall target="${tardepends}" /> + </target> + <target name="tar" depends="signall"> <tar destfile="${release.tarball}" compression="gzip"> <tarfileset dir="." prefix="${name}-${release.version}"> diff --git a/java/build.xml.template b/java/build.xml.template index 7c29704..cdc5582 100644 --- a/java/build.xml.template +++ b/java/build.xml.template @@ -16,6 +16,11 @@ Remove, if this project uses the java version defined in base.xml <property name="source-and-target-java-version" value="1.7" /> --> +   <property name="name" value="XXXX"/>

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 04 Jan '17

04 Jan '17

commit ace72c8edb2a8608b501cd90d3b1826824b681f8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 4 09:51:19 2017 +0000 Update translations for tor-browser-manual --- zh_CN/zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 29cc2eb..7c98237 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -1,11 +1,11 @@ # Translators: -# Y.F Yang <yfdyh000(a)gmail.com>, 2016 +# YF <yfdyh000(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Y.F Yang <yfdyh000(a)gmail.com>, 2016\n" +"Last-Translator: YF <yfdyh000(a)gmail.com>, 2016\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[metrics-base/master] Limit line length to 80. Removed property 'maxLineLength' from 'LeftCurly', because it is deprecated (since 6.10) and defaults to 80 anyway.
by karsten＠torproject.org 03 Jan '17

03 Jan '17

commit 540b072483129601b7a856bc0a3a44e3c325586d Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Jan 3 18:00:00 2017 +0100 Limit line length to 80. Removed property 'maxLineLength' from 'LeftCurly', because it is deprecated (since 6.10) and defaults to 80 anyway. --- java/metrics_checks.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/metrics_checks.xml b/java/metrics_checks.xml index e3b04ca..858d4ea 100644 --- a/java/metrics_checks.xml +++ b/java/metrics_checks.xml @@ -18,6 +18,8 @@ - Added a check for unused imports [UnusedImports]. + - Limit line length to 80 [LineLength]. + Checkstyle is very configurable. Be sure to read the documentation at http://checkstyle.sf.net (or in your downloaded distribution). @@ -37,7 +39,7 @@ <module name="FileTabCharacter"> <property name="eachLine" value="true"/> </module> - + <module name="SuppressWarningsFilter" /> <module name="TreeWalker"> <module name="OuterTypeFilename"/> @@ -52,7 +54,7 @@ <property name="allowNonPrintableEscapes" value="true"/> </module> <module name="LineLength"> - <property name="max" value="100"/> + <property name="max" value="80"/> <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/> </module> <module name="AvoidStarImport"/> @@ -64,9 +66,7 @@ <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> </module> <module name="NeedBraces"/> - <module name="LeftCurly"> - <property name="maxLineLength" value="100"/> - </module> + <module name="LeftCurly"/> <module name="RightCurly"/> <module name="RightCurly"> <property name="option" value="alone"/>

1 0

[metrics-base/master] Tweaked base.xml and build template. The copyright year for javadoc is now computed from the current time UTC.
by karsten＠torproject.org 03 Jan '17

03 Jan '17

commit 832624476ca540a63efe711d9935be9227254db1 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Jan 3 18:00:00 2017 +0100 Tweaked base.xml and build template. The copyright year for javadoc is now computed from the current time UTC. --- java/base.xml | 23 +++++++++++++---------- java/build.xml.template | 8 +++++++- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/java/base.xml b/java/base.xml index 989a85f..0658cdb 100644 --- a/java/base.xml +++ b/java/base.xml @@ -10,7 +10,6 @@ <property name="dist" value="${generated}/dist"/> <property name="signed" value="${dist}/signed"/> <property name="classes" value="${generated}/classes/"/> - <property name="source-and-target-java-version" value="1.7" /> <property name="docs" value="${generated}/javadoc"/> <property name="testsources" value="src/test/java"/> <property name="testresources" value="src/test/resources/"/> @@ -18,7 +17,6 @@ <property name="coverageresult" value="${generated}/coverage-report/"/> <property name="instrument" value="${generated}/instrument/"/> <property name="testclasses" value="${generated}/testclasses/"/> - <property name="libs" value="lib"/> <property name="cobertura.ser.file" value="${basedir}/cobertura.ser" /> <property name="jarfile" value="${name}-${release.version}.jar" /> <property name="jarsourcesfile" @@ -94,13 +92,13 @@ <target name="usage"> <echo message="The main ant targets are:" /> - <echo message="'clean' Remove all generated files." /> - <echo message="'compile' compile sources to ${classes}." /> - <echo message="'test' run all tests (see ${testresult} for results)." /> - <echo message="'docs' create all javadoc in ${docs}." /> - <echo message="'checks' Checkstyle checks (see ${generated}/checkstyle_report.txt)." /> - <echo message="'coverage' Cobertura coverage check ${coverageresult}." /> - <echo message="'tar' Creates a release tarball in ${dist}." /> + <echo message="'clean' removes all generated files." /> + <echo message="'compile' compiles sources to ${classes}." /> + <echo message="'test' runs all tests (see ${testresult})." /> + <echo message="'docs' creates all javadoc in ${docs}." /> + <echo message="'checks' checks coding style (see ${generated}/checkstyle_report.txt)." /> + <echo message="'coverage' checks coverage (see ${coverageresult})." /> + <echo message="'tar' creates a release tarball in ${dist}." /> </target> <target name="submoduleupdate" > @@ -152,8 +150,13 @@ </target> <target name="docs"> + <tstamp> + <format property="copyyear" + pattern="yyyy" + timezone="UTC" /> + </tstamp> <javadoc destdir="${docs}" - footer="&copy; 2016 The Tor Project" + footer="&copy; ${copyyear} The Tor Project" doctitle="${javadoc-title}" overview="${basedir}/${resources}/overview.html" use="true" diff --git a/java/build.xml.template b/java/build.xml.template index baa2c03..7c29704 100644 --- a/java/build.xml.template +++ b/java/build.xml.template @@ -11,6 +11,11 @@ <property name="javadoc-title" value="XXXX API Documentation"/> <property name="implementation-title" value="XXXX" /> <property name="release.version" value="XXXX" /> +   <property name="name" value="XXXX"/> @@ -23,8 +28,9 @@ <property name="jarincludes" value="XXXX" />  - <property name="jarpatterprop" value="XXXX" /> + <property name="jarpatternprop" value="XXXX" />  <target name="coverage-check">

1 0

[tor-messenger-build/master] Bump version after release
by arlo＠torproject.org 03 Jan '17

03 Jan '17

commit 09f9aa4b2b861030e349b77fa5dca394b514c01a Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Jan 3 11:27:08 2017 -0800 Bump version after release --- ChangeLog | 3 +++ rbm.conf | 2 +- tools/update-responses/config.yml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b3f643..6cfd17c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Tor Messenger 0.3.0b3 -- + * All Platforms + Tor Messenger 0.3.0b2 -- December 29, 2016 * All Platforms * Use the tor-browser-45.6.0esr-6.0-1-build1 tag on tor-browser diff --git a/rbm.conf b/rbm.conf index 15ae01e..0404940 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,7 +6,7 @@ output_dir: "out/[% project %]" pkg_type: build var: - tormessenger_version: '0.3.0b2' + tormessenger_version: '0.3.0b3' copyright_year: '2016' build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: | diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index b5862e3..d504f85 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -18,7 +18,7 @@ build_targets: - WINNT_x86-gcc3-x64 osx64: Darwin_x86_64-gcc3 channels: - release: 0.3.0b2 + release: 0.3.0b3 versions: 0.3.0b1: platformVersion: 45.5.0

1 0

[stem/master] Stem release 1.5.4
by atagar＠torproject.org 03 Jan '17

03 Jan '17

commit 53903095cf2814752bab0e84f9b833b531f77a16 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 3 10:21:46 2017 -0800 Stem release 1.5.4 Hotfix release so our descriptor validator is content with the live tor consensus... https://trac.torproject.org/projects/tor/ticket/21059 --- docs/change_log.rst | 3 +++ docs/index.rst | 2 +- stem/__init__.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index a3b3d9a..3da184e 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -114,6 +114,9 @@ The following are only available within Stem's `git repository * **Version 1.5.3** (December 5th, 2016) - including tests and site in the release tarball + * **Version 1.5.4** (January 4th, 2017) - drop validation of the order of + fields in the tor consensus (:trac:`21059`) + .. _version_1.4: Version 1.4 (May 13th, 2015) diff --git a/docs/index.rst b/docs/index.rst index f265f4e..1df01d1 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,7 +1,7 @@ Welcome to Stem! ================ -Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. With it you can use Tor's `control protocol <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ to script against the Tor process, or build things such as `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.5.3** (released December 5th, 2016). +Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. With it you can use Tor's `control protocol <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ to script against the Tor process, or build things such as `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.5.4** (released January 3rd, 2017). .. Main Stem Logo Source: http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html diff --git a/stem/__init__.py b/stem/__init__.py index 66502c8..7a84f8c 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -470,7 +470,7 @@ Library for working with the tor process. import stem.util.enum -__version__ = '1.5.3' +__version__ = '1.5.4' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[stem/master] Stop checking consensus field ordering
by atagar＠torproject.org 03 Jan '17

03 Jan '17

commit d561974fc1bf81e0ef2ffee9a93f19454b954f9c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 2 18:31:45 2017 -0800 Stop checking consensus field ordering Tor's spec details the order that consensus fields should appear in, but this is a detail tor frequently gets wrong. The spec's been changed to loosen this requirement... https://trac.torproject.org/projects/tor/ticket/21059 https://gitweb.torproject.org/torspec.git/commit/?id=578477a As such Stem should no longer validate this. New misordered additions in the live tor consensus have been causing our validator to alarm but with this it's once again happy. Turns out the order check also masked some issues with our missing fields test. Took a while to figure out but in-place modification of our 'attr' subtly broke it. Addressing this with a defensive shallow copy. --- stem/descriptor/networkstatus.py | 41 +++-------------------- test/mocking.py | 14 ++++---- test/unit/descriptor/networkstatus/document_v3.py | 29 +--------------- 3 files changed, 11 insertions(+), 73 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 815e5f5..d104ec9 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -132,9 +132,6 @@ FOOTER_STATUS_DOCUMENT_FIELDS = ( ('directory-signature', True, True, True), ) -HEADER_FIELDS = [attr[0] for attr in HEADER_STATUS_DOCUMENT_FIELDS] -FOOTER_FIELDS = [attr[0] for attr in FOOTER_STATUS_DOCUMENT_FIELDS] - AUTH_START = 'dir-source' ROUTERS_START = 'r' FOOTER_START = 'directory-footer' @@ -962,12 +959,13 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): def _header(self, document_file, validate): content = bytes.join(b'', _read_until_keywords((AUTH_START, ROUTERS_START, FOOTER_START), document_file)) entries = _get_descriptor_components(content, validate) + header_fields = [attr[0] for attr in HEADER_STATUS_DOCUMENT_FIELDS] if validate: # all known header fields can only appear once except for keyword, values in list(entries.items()): - if len(values) > 1 and keyword in HEADER_FIELDS and keyword != 'package' and keyword != 'shared-rand-commit': + if len(values) > 1 and keyword in header_fields and keyword != 'package' and keyword != 'shared-rand-commit': raise ValueError("Network status documents can only have a single '%s' line, got %i" % (keyword, len(values))) if self._default_params: @@ -976,7 +974,6 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): self._parse(entries, validate, parser_for_line = self.HEADER_PARSER_FOR_LINE) _check_for_missing_and_disallowed_fields(self, entries, HEADER_STATUS_DOCUMENT_FIELDS) - _check_for_misordered_fields(entries, HEADER_FIELDS) # default consensus_method and consensus_methods based on if we're a consensus or vote @@ -990,13 +987,14 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): def _footer(self, document_file, validate): entries = _get_descriptor_components(document_file.read(), validate) + footer_fields = [attr[0] for attr in FOOTER_STATUS_DOCUMENT_FIELDS] if validate: for keyword, values in list(entries.items()): # all known footer fields can only appear once except... # * 'directory-signature' in a consensus - if len(values) > 1 and keyword in FOOTER_FIELDS: + if len(values) > 1 and keyword in footer_fields: if not (keyword == 'directory-signature' and self.is_consensus): raise ValueError("Network status documents can only have a single '%s' line, got %i" % (keyword, len(values))) @@ -1015,7 +1013,6 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): raise ValueError("Network status document's footer should start with a 'directory-signature' line prior to consensus-method 9") _check_for_missing_and_disallowed_fields(self, entries, FOOTER_STATUS_DOCUMENT_FIELDS) - _check_for_misordered_fields(entries, FOOTER_FIELDS) else: self._footer_entries = entries self._entries.update(entries) @@ -1087,36 +1084,6 @@ def _check_for_missing_and_disallowed_fields(document, entries, fields): raise ValueError("Network status document has fields that shouldn't appear in this document type or version: %s" % ', '.join(disallowed_fields)) -def _check_for_misordered_fields(entries, expected): - """ - To be valid a network status document's fiends need to appear in a specific - order. Checks that known fields appear in that order (unrecognized fields - are ignored). - - :param dict entries: ordered keyword/value mappings of the header or footer - :param list expected: ordered list of expected fields (either - **HEADER_FIELDS** or **FOOTER_FIELDS**) - - :raises: **ValueError** if entries aren't properly ordered - """ - - # Earlier validation has ensured that our fields either belong to our - # document type or are unknown. Remove the unknown fields since they - # reflect a spec change and can appear anywhere in the document. - - actual = [field for field in entries.keys() if field in expected] - - # Narrow the expected to just what we have. If the lists then match then the - # order's valid. - - expected = [field for field in expected if field in actual] - - if actual != expected: - actual_label = ', '.join(actual) - expected_label = ', '.join(expected) - raise ValueError("The fields in a section of the document are misordered. It should be '%s' but was '%s'" % (expected_label, actual_label)) - - def _parse_int_mappings(keyword, value, validate): # Parse a series of 'key=value' entries, checking the following: # - values are integers diff --git a/test/mocking.py b/test/mocking.py index 5a86690..7ffb11c 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -323,9 +323,7 @@ def _get_descriptor_content(attr = None, exclude = (), header_template = (), foo """ header_content, footer_content = [], [] - - if attr is None: - attr = {} + attr = {} if attr is None else dict(attr) attr = OrderedDict(attr) # shallow copy since we're destructive @@ -564,8 +562,7 @@ def get_directory_authority(attr = None, exclude = (), is_vote = False, content :returns: DirectoryAuthority for the requested descriptor content """ - if attr is None: - attr = {} + attr = {} if attr is None else dict(attr) if not is_vote: # entries from a consensus also have a mandatory 'vote-digest' field @@ -637,8 +634,7 @@ def get_network_status_document_v3(attr = None, exclude = (), authorities = None :returns: NetworkStatusDocumentV3 for the requested descriptor content """ - if attr is None: - attr = {} + attr = {} if attr is None else dict(attr) # add defaults only found in a vote, consensus, or microdescriptor @@ -658,7 +654,9 @@ def get_network_status_document_v3(attr = None, exclude = (), authorities = None } for k, v in extra_defaults.items(): - if not (k in attr or (exclude and k in exclude)): + if exclude and k in exclude: + continue # explicitly excluding this field + elif k not in attr: attr[k] = v desc_content = _get_descriptor_content(attr, exclude, NETWORK_STATUS_DOCUMENT_HEADER, NETWORK_STATUS_DOCUMENT_FOOTER) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index aae12a6..4bbc2ef 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -32,7 +32,6 @@ from test.mocking import ( get_router_status_entry_micro_v3, get_directory_authority, get_network_status_document_v3, - CRYPTO_BLOB, DOC_SIG, NETWORK_STATUS_DOCUMENT_FOOTER, ) @@ -474,7 +473,7 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= for entries in (HEADER_STATUS_DOCUMENT_FIELDS, FOOTER_STATUS_DOCUMENT_FIELDS): for field, in_votes, in_consensus, is_mandatory in entries: - if is_mandatory and ((is_consensus and in_consensus) or (is_vote and in_votes)): + if is_mandatory and field != 'vote-status' and ((is_consensus and in_consensus) or (is_vote and in_votes)): content = get_network_status_document_v3(attr, exclude = (field,), content = True) self.assertRaises(ValueError, NetworkStatusDocumentV3, content, True) NetworkStatusDocumentV3(content, False) # constructs without validation @@ -487,32 +486,6 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= document = get_network_status_document_v3({'pepperjack': 'is oh so tasty!'}) self.assertEqual(['pepperjack is oh so tasty!'], document.get_unrecognized_lines()) - def test_misordered_fields(self): - """ - Rearranges our descriptor fields. - """ - - for is_consensus in (True, False): - attr = {'vote-status': 'consensus'} if is_consensus else {'vote-status': 'vote'} - lines = get_network_status_document_v3(attr, content = True).split(b'\n') - - for index in range(len(lines) - 1): - # once we reach the authority entry or later we're done since swapping - # those won't be detected - - if is_consensus and lines[index].startswith(stem.util.str_tools._to_bytes(CRYPTO_BLOB[1:10])): - break - elif not is_consensus and lines[index].startswith(b'dir-source'): - break - - # swaps this line with the one after it - test_lines = list(lines) - test_lines[index], test_lines[index + 1] = test_lines[index + 1], test_lines[index] - - content = b'\n'.join(test_lines) - self.assertRaises(ValueError, NetworkStatusDocumentV3, content, True) - NetworkStatusDocumentV3(content, False) # constructs without validation - def test_duplicate_fields(self): """ Almost all fields can only appear once. Checking that duplicates cause

1 0

[stem/master] Merge version 1.5.4 hotfix
by atagar＠torproject.org 03 Jan '17

03 Jan '17

commit 65add2a35b45d6d12d29fa4cc2489208b1300f81 Merge: 50f154a 5390309 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 3 10:33:08 2017 -0800 Merge version 1.5.4 hotfix docs/change_log.rst | 3 ++ docs/index.rst | 2 +- stem/__init__.py | 2 +- stem/descriptor/networkstatus.py | 47 ++--------------------- test/mocking.py | 14 +++---- test/unit/descriptor/networkstatus/document_v3.py | 29 +------------- 6 files changed, 16 insertions(+), 81 deletions(-) diff --cc stem/__init__.py index 1acf0f4,7a84f8c..d74e90b --- a/stem/__init__.py +++ b/stem/__init__.py @@@ -470,7 -470,7 +470,7 @@@ Library for working with the tor proces import stem.util.enum - __version__ = '1.5.3-dev' -__version__ = '1.5.4' ++__version__ = '1.5.4-dev' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 03 Jan '17

03 Jan '17

commit 1eb675f2d0818a1012d273fc65a4dd5c94602d21 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 3 18:18:38 2017 +0000 Update translations for tor-browser-manual --- es_MX/es_MX.po | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/es_MX/es_MX.po b/es_MX/es_MX.po index ae60b57..2df1a61 100644 --- a/es_MX/es_MX.po +++ b/es_MX/es_MX.po @@ -56,12 +56,19 @@ msgid "" "real Internet (IP) address, and will not know who you are unless you " "explicitly identify yourself." msgstr "" +"Los operadores de los sitios web y servicios que usas, y cualquiera que los " +"vea, vera una conexión que viene de la red Tor en vez de tu dirección de " +"Internet real (IP), y no sabra quien eres tu a menos que tu explicitamente " +"te identifiques. " #: about-tor-browser.page:34 msgid "" "In addition, Tor Browser is designed to prevent websites from " "“fingerprinting” or identifying you based on your browser configuration." msgstr "" +"Ademas, el Explorador Tor esta diseñado para prevenir sitios web de " +"registrar tu huella digital o identificarte por tu configuración de " +"explorador. " #: about-tor-browser.page:39 msgid "" @@ -69,6 +76,10 @@ msgid "" " valid for a single session (until Tor Browser is exited or a <link xref" "=\"managing-identities#new-identity\">New Identity</link> is requested)." msgstr "" +"Por defecto, el explorador Tor no mantiene el historial del explorador. Las " +"cookies solo son validas para una sola cesión (hasta que salgas del " +"explorador Tor o un <link xref=\"managing-identities#new-identity\">Nueva " +"Identidad</link> sea solicitada). " #: about-tor-browser.page:50 msgid "How Tor works"

1 0