- tor-commits - lists.torproject.org

[stem/master] Fix --test and --exclude-test arguments
by atagar＠torproject.org 15 May '20

15 May '20

commit 3a71bd9eef0445b5454bd931bb35cc83da257c3b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 14 17:41:12 2020 -0700 Fix --test and --exclude-test arguments Commit 076f89d rewrote how we parse arguments. This broke our --test and --exclude-test arguments because there is no longer a default value in the 'args' dictionary... % ./run_tests.py --unit --test endpoint Traceback (most recent call last): File "./run_tests.py", line 482, in <module> main() File "./run_tests.py", line 197, in main args = test.arguments.Arguments.parse(sys.argv[1:]) File "/home/atagar/Desktop/stem/test/arguments.py", line 109, in parse args['specific_test'].append(crop_module_name(arg)) KeyError: 'specific_test' Reported by teor on... https://github.com/torproject/stem/issues/63 --- test/arguments.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/arguments.py b/test/arguments.py index e06148c4..cab15400 100644 --- a/test/arguments.py +++ b/test/arguments.py @@ -106,9 +106,9 @@ class Arguments(NamedTuple): args['attribute_targets'] = attribute_targets elif opt == '--test': - args['specific_test'].append(crop_module_name(arg)) + args.setdefault('specific_test', []).append(crop_module_name(arg)) elif opt == '--exclude-test': - args['exclude_test'].append(crop_module_name(arg)) + args.setdefault('exclude_test', []).append(crop_module_name(arg)) elif opt in ('-l', '--log'): arg = arg.upper()

1 0

[tor/release-0.4.3] put a . at the end of changes entry
by arma＠torproject.org 15 May '20

15 May '20

commit 5ceb60e5ca61fec9f67c1fcae4d80d0c98e7104c Author: Roger Dingledine <arma(a)torproject.org> Date: Thu May 14 20:39:00 2020 -0400 put a . at the end of changes entry --- ChangeLog | 2 +- ReleaseNotes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f08ceda9..bba339f47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -655,7 +655,7 @@ Changes in version 0.4.3.1-alpha - 2020-01-22 o Minor bugfixes (controller): - In routerstatus_has_changed(), check all the fields that are output over the control port. Fixes bug 20218; bugfix - on 0.1.1.11-alpha + on 0.1.1.11-alpha. o Minor bugfixes (correctness checks): - Use GCC/Clang's printf-checking feature to make sure that diff --git a/ReleaseNotes b/ReleaseNotes index eeb80b27b..785749f24 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -317,7 +317,7 @@ Changes in version 0.4.3.5 - 2020-05-15 o Minor bugfixes (controller): - In routerstatus_has_changed(), check all the fields that are output over the control port. Fixes bug 20218; bugfix - on 0.1.1.11-alpha + on 0.1.1.11-alpha. o Minor bugfixes (developer tools): - Allow paths starting with ./ in scripts/add_c_file.py. Fixes bug

1 0

[tor/release-0.4.3] unlist things that were already stable in 0.4.2.5
by arma＠torproject.org 15 May '20

15 May '20

commit 2c5e1b9ed3e279f66bb25ca96686029175040c77 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu May 14 20:35:28 2020 -0400 unlist things that were already stable in 0.4.2.5 --- ChangeLog | 4 ++-- ReleaseNotes | 43 +------------------------------------------ 2 files changed, 3 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index f45f3cc95..8f08ceda9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in vesion 0.4.3.5 - 2020-05-15 +Changes in version 0.4.3.5 - 2020-05-15 Tor 0.4.3.5 is the first stable release in the 0.4.3.x series. This series adds support for building without relay code enabled, and implements functionality needed for OnionBalance with v3 onion @@ -18,7 +18,7 @@ Changes in vesion 0.4.3.5 - 2020-05-15 Feb 2022. Below are the changes since 0.4.3.4-rc. For a complete list of changes - since 0.4.2.5, see the ReleaseNotes file. + since 0.4.2.6, see the ReleaseNotes file. o Minor bugfixes (compiler compatibility): - Avoid compiler warnings from Clang 10 related to the use of GCC- diff --git a/ReleaseNotes b/ReleaseNotes index c96d4abf1..eeb80b27b 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -21,7 +21,7 @@ Changes in version 0.4.3.5 - 2020-05-15 continue supporting 0.3.5.x, our long-term stable series, until Feb 2022. - Below are the changes since 0.4.2.5. For a list of only the changes + Below are the changes since 0.4.2.6. For a list of only the changes since 0.4.3.4-rc, see the ChangeLog file. o New system requirements: @@ -88,19 +88,6 @@ Changes in version 0.4.3.5 - 2020-05-15 find the GeoIP cache entry for that client address. Fixes bug 33491; bugfix on 0.3.3.2-alpha. - o Major bugfixes (linux seccomp sandbox): - - Correct how we use libseccomp. Particularly, stop assuming that - rules are applied in a particular order or that more rules are - processed after the first match. Neither is the case! In - libseccomp <2.4.0 this led to some rules having no effect. - libseccomp 2.4.0 changed how rules are generated, leading to a - different ordering, which in turn led to a fatal crash during - startup. Fixes bug 29819; bugfix on 0.2.5.1-alpha. Patch by - Peter Gerber. - - Fix crash when reloading logging configuration while the - experimental sandbox is enabled. Fixes bug 32841; bugfix on - 0.4.1.7. Patch by Peter Gerber. - o Major bugfixes (networking): - Correctly handle IPv6 addresses in SOCKS5 RESOLVE_PTR requests, and accept strings as well as binary addresses. Fixes bug 32315; @@ -332,11 +319,6 @@ Changes in version 0.4.3.5 - 2020-05-15 output over the control port. Fixes bug 20218; bugfix on 0.1.1.11-alpha - o Minor bugfixes (correctness checks): - - Use GCC/Clang's printf-checking feature to make sure that - tor_assertf() arguments are correctly typed. Fixes bug 32765; - bugfix on 0.4.1.1-alpha. - o Minor bugfixes (developer tools): - Allow paths starting with ./ in scripts/add_c_file.py. Fixes bug 31336; bugfix on 0.4.1.2-alpha. @@ -388,11 +370,6 @@ Changes in version 0.4.3.5 - 2020-05-15 Previously we would say this whenever a BUG() check failed in the code. Fixes bug 33095; bugfix on 0.4.1.1-alpha. - o Minor bugfixes (logging, crash): - - Avoid a possible crash when trying to log a (fatal) assertion - failure about mismatched magic numbers in configuration objects. - Fixes bug 32771; bugfix on 0.4.2.1-alpha. - o Minor bugfixes (onion services v2): - Move a series of v2 onion service warnings to protocol-warning level because they can all be triggered remotely by a malformed @@ -455,12 +432,6 @@ Changes in version 0.4.3.5 - 2020-05-15 on 0.2.7.3-rc. - Stop ignoring "tor --dump-config" errors in test_parseconf.sh. Fixes bug 32468; bugfix on 0.4.2.1-alpha. - - When TOR_DISABLE_PRACTRACKER is set, do not apply it to the - test_practracker.sh script. Doing so caused a test failure. Fixes - bug 32705; bugfix on 0.4.2.1-alpha. - - When TOR_DISABLE_PRACTRACKER is set, log a notice to stderr when - skipping practracker checks. Fixes bug 32705; bugfix - on 0.4.2.1-alpha. - Our option-validation tests no longer depend on specially configured non-default, non-passing sets of options. Previously, the tests had been written to assume that options would _not_ be @@ -473,10 +444,6 @@ Changes in version 0.4.3.5 - 2020-05-15 some CPU-wasting loops if the bug is ever triggered. Bug reported by opara. Fixes bug 32673; bugfix on 0.3.0.4-alpha. - o Minor bugfixes (windows service): - - Initialize the publish/subscribe system when running as a windows - service. Fixes bug 32778; bugfix on 0.4.1.1-alpha. - o Deprecated features: - Deprecate the ClientAutoIPv6ORPort option. This option was not true "Happy Eyeballs", and often failed on connections that @@ -524,15 +491,8 @@ Changes in version 0.4.3.5 - 2020-05-15 on option validation and normalization. Closes ticket 32213. - Improve the consistency of test_parseconf.sh output, and run all the tests, even if one fails. Closes ticket 32213. - - Re-enable the Travis CI macOS Chutney build, but don't let it - prevent the Travis job from finishing. (The Travis macOS jobs are - slow, so we don't want to have it delay the whole CI process.) - Closes ticket 32629. - Run the practracker unit tests in the pre-commit git hook. Closes ticket 32609. - - Turn off Tor's Sandbox in Chutney jobs, and run those jobs on - Ubuntu Bionic. Turning off the Sandbox is a work-around, until we - fix the sandbox errors in 32722. Closes ticket 32240. o Code simplification and refactoring (channel): - Channel layer had a variable length cell handler that was not used @@ -645,7 +605,6 @@ Changes in version 0.4.3.5 - 2020-05-15 ticket 32196. o Testing (Travis CI): - - Use zstd in our Travis Linux builds. Closes ticket 32242. - Remove a redundant distcheck job. Closes ticket 33194. - Sort the Travis jobs in order of speed: putting the slowest jobs first takes full advantage of Travis job concurrency. Closes

1 0

[tor/master] remove changes files that have already appeared in 0.4.3.
by nickm＠torproject.org 15 May '20

15 May '20

commit 85cfd04c0ce1a8446ce2e7c4e79d505a9f713ee7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 20:29:00 2020 -0400 remove changes files that have already appeared in 0.4.3. --- changes/bug31669 | 4 ---- changes/bug33032 | 6 ------ changes/bug33087 | 7 ------- changes/bug33545 | 4 ---- changes/bug33608 | 5 ----- changes/bug33668 | 4 ---- changes/bug33673 | 6 ------ changes/bug33674 | 4 ---- changes/bug33782 | 7 ------- changes/bug33918 | 3 --- changes/bug34077 | 3 --- changes/bug34078 | 5 ----- changes/bug34131 | 4 ---- changes/ticket33491 | 6 ------ changes/ticket33643 | 5 ----- changes/ticket33643_part2 | 3 --- changes/ticket33646 | 4 ---- 17 files changed, 80 deletions(-) diff --git a/changes/bug31669 b/changes/bug31669 deleted file mode 100644 index 8079c98f6..000000000 --- a/changes/bug31669 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (onion services v3): - - Relax severity of a log message that can appear naturally when decoding - onion service descriptors as a relay. Also add some diagnostics to debug - any future bugs in that area. Fixes bug 31669; bugfix on 0.3.0.1-alpha. \ No newline at end of file diff --git a/changes/bug33032 b/changes/bug33032 deleted file mode 100644 index 0c665f25d..000000000 --- a/changes/bug33032 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (key portability): - - When reading PEM-encoded key data, tolerate CRLF line-endings even if - we are not running on Windows. Previously, non-Windows hosts - would reject these line-endings in certain positions, making - certain key files hard to move from one host to another. - Fixes bug 33032; bugfix on 0.3.5.1-alpha. diff --git a/changes/bug33087 b/changes/bug33087 deleted file mode 100644 index ab6df58cc..000000000 --- a/changes/bug33087 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (logging): - - Stop closing stderr and stdout during shutdown. Closing these file - descriptors can hide sanitiser logs. - Fixes bug 33087; bugfix on 0.4.1.6. - - Flush stderr, stdout, and file logs during shutdown, if supported by the - OS. This change helps make sure that any final logs are recorded. - Fixes bug 33087; bugfix on 0.4.1.6. diff --git a/changes/bug33545 b/changes/bug33545 deleted file mode 100644 index c051b0160..000000000 --- a/changes/bug33545 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (hidden services): - - Block a client-side assert by disallowing the registration of an x25519 - client auth key that's all zeroes. Fixes bug 33545; bugfix on - 0.4.3.1-alpha. Patch based on patch from "cypherpunks". \ No newline at end of file diff --git a/changes/bug33608 b/changes/bug33608 deleted file mode 100644 index 0e82a8eec..000000000 --- a/changes/bug33608 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (client IPv6): - - Stop forcing all non-SOCKSPorts to prefer IPv6 exit connections. Instead, - prefer IPv6 connections by default, but allow users to change their - configs using the "NoPreferIPv6" port flag. - Fixes bug 33608; bugfix on 0.4.3.1-alpha. diff --git a/changes/bug33668 b/changes/bug33668 deleted file mode 100644 index 2b0830d6d..000000000 --- a/changes/bug33668 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (--disable-module-relay): - - Fix an assertion failure when Tor is build without the relay module, - and then invoked with the "User" option. Fixes bug 33668; bugfix on - 0.4.3.1-alpha. diff --git a/changes/bug33673 b/changes/bug33673 deleted file mode 100644 index 37c00f2e6..000000000 --- a/changes/bug33673 +++ /dev/null @@ -1,6 +0,0 @@ - o Testing: - - In our Appveyor Windows CI, copy required DLLs to test and app, before - running tor's tests. This ensures that tor.exe and test*.exe use the - correct version of each DLL. This fix is not required, but we hope it - will avoid DLL search issues in future. - Fixes bug 33673; bugfix on 0.3.4.2-alpha. diff --git a/changes/bug33674 b/changes/bug33674 deleted file mode 100644 index bcc3fcab0..000000000 --- a/changes/bug33674 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (--disable-module-relay,--disable-module-dirauth): - - Set some output arguments in the relay and dirauth module stubs, to - guard against future stub argument handling bugs like 33668. - Fixes bug 33674; bugfix on 0.4.3.1-alpha. diff --git a/changes/bug33782 b/changes/bug33782 deleted file mode 100644 index 9d4a0e7a7..000000000 --- a/changes/bug33782 +++ /dev/null @@ -1,7 +0,0 @@ - o Testing: - - Avoid conflicts between the fake sockets in tor's unit tests, and real - file descriptors. Resolves issues running unit tests with GitHub Actions, - where the process that embeds or launches the tests has already opened a - large number of file descriptors. - Fixes bug 33782; bugfix on 0.2.8.1-alpha. - Found and fixed by Putta Khunchalee. diff --git a/changes/bug33918 b/changes/bug33918 deleted file mode 100644 index e1467b4aa..000000000 --- a/changes/bug33918 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (IPv6, logging): - - Stop truncating IPv6 addresses and ports in channel and connection logs. - Fixes bug 33918; bugfix on 0.2.4.4-alpha. diff --git a/changes/bug34077 b/changes/bug34077 deleted file mode 100644 index 29458bd9d..000000000 --- a/changes/bug34077 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compiler warnings): - - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix on - 0.4.0.3-alpha. diff --git a/changes/bug34078 b/changes/bug34078 deleted file mode 100644 index 1015d2454..000000000 --- a/changes/bug34078 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (compiler compatibility): - - Avoid compiler warnings from Clang 10 related to the use of - GCC-style "/* falls through */" comments. Both Clang and GCC allow - __attribute__((fallthrough)) instead, so that's what we're using now. - Fixes bug 34078; bugfix on 0.3.1.3-alpha. diff --git a/changes/bug34131 b/changes/bug34131 deleted file mode 100644 index eb3a3feba..000000000 --- a/changes/bug34131 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (logging): - - Fix a logic error in a log message about whether an address was - invalid. Previously, the code would never report that onion addresses - were onion addresses. Fixes bug 34131; bugfix on 0.4.3.1-alpha. diff --git a/changes/ticket33491 b/changes/ticket33491 deleted file mode 100644 index 595ea863e..000000000 --- a/changes/ticket33491 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (DoS defenses, bridges, pluggable transport): - - DoS subsystem was not given the transport name of the client connection - when tor is a bridge and thus failing to find the GeoIP cache entry for - that client address. This resulted in failing to apply DoS defenses on - bridges with a pluggable transport. Fixes bug 33491; bugfix on - 0.3.3.2-alpha. diff --git a/changes/ticket33643 b/changes/ticket33643 deleted file mode 100644 index 7fddab74e..000000000 --- a/changes/ticket33643 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (testing): - - The unit tests now support a "TOR_SKIP_TESTCASES" environment variable - to specify a list of space-separated test cases that should not be - executed. We will use this to disable certain tests that are failing on - Appveyor because of mismatched OpenSSL libraries. Part of ticket 33643. diff --git a/changes/ticket33643_part2 b/changes/ticket33643_part2 deleted file mode 100644 index 28193d2af..000000000 --- a/changes/ticket33643_part2 +++ /dev/null @@ -1,3 +0,0 @@ - o Testing (CI): - - On appveyor, skip the crypto/openssl_version test, which is failing - because of a mismatched library installation. Fix for 33643. diff --git a/changes/ticket33646 b/changes/ticket33646 deleted file mode 100644 index 751c5d5bf..000000000 --- a/changes/ticket33646 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (build system): - - Correctly output the enabled module in the configure summary. Before that, - the list shown was just plain wrong. Fixes bug 33646; bugfix on - 0.4.3.2-alpha.

1 0

[tor/release-0.4.3] blurb for 0.4.3.5
by nickm＠torproject.org 15 May '20

15 May '20

commit 311f5ded50f91e6207b535bc144912ad1fe00134 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 20:07:38 2020 -0400 blurb for 0.4.3.5 --- ChangeLog | 8 ++++++-- ReleaseNotes | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index baaba46bf..f45f3cc95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ Changes in vesion 0.4.3.5 - 2020-05-15 - Tor 0.4.3.5 is the first stable release in the 0.4.3.x series. BLURB - BLURB BLURB BLURB BLURB BLURB BLURB BLURB BLURB + Tor 0.4.3.5 is the first stable release in the 0.4.3.x series. This + series adds support for building without relay code enabled, and + implements functionality needed for OnionBalance with v3 onion + services. It includes significant refactoring of our configuration and + controller functionality, and fixes numerous smaller bugs and + performance issues. Per our support policy, we support each stable release series for nine months after its first stable release, or three months after the first diff --git a/ReleaseNotes b/ReleaseNotes index 99e1c53fa..c96d4abf1 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,7 +3,23 @@ release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. Changes in version 0.4.3.5 - 2020-05-15 - COPY BLURB HERE. + Tor 0.4.3.5 is the first stable release in the 0.4.3.x series. This + series adds support for building without relay code enabled, and + implements functionality needed for OnionBalance with v3 onion + services. It includes significant refactoring of our configuration and + controller functionality, and fixes numerous smaller bugs and + performance issues. + + Per our support policy, we support each stable release series for nine + months after its first stable release, or three months after the first + stable release of the next series: whichever is longer. This means + that 0.4.3.x will be supported until around February 2021--later, if + 0.4.4.x is later than anticipated. + + Note also that support for 0.4.1.x is about to end on May 20 of this + year; 0.4.2.x will be supported until September 15. We still plan to + continue supporting 0.3.5.x, our long-term stable series, until + Feb 2022. Below are the changes since 0.4.2.5. For a list of only the changes since 0.4.3.4-rc, see the ChangeLog file.

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/71'
by nickm＠torproject.org 15 May '20

15 May '20

commit b3d68896858c3456bec1140afc8e078967c1713d Merge: 76ba7f8 9c325ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 14 20:00:59 2020 -0400 Merge remote-tracking branch 'tor-github/pr/71' lib/chutney/TorNet.py | 1 - lib/chutney/Traffic.py | 2 -- 2 files changed, 3 deletions(-)

1 0

[chutney/master] lint: Remove unused variables and modules
by nickm＠torproject.org 15 May '20

15 May '20

commit 9c325ceb15ac0f3d6181b2c393d743633b9b508e Author: c <c(a)chroniko.jp> Date: Thu May 14 21:34:04 2020 +0000 lint: Remove unused variables and modules --- lib/chutney/TorNet.py | 3 +-- lib/chutney/Traffic.py | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 41390e6..aceddb8 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -19,7 +19,6 @@ import os import platform import re import signal -import shutil import subprocess import sys import time @@ -389,7 +388,7 @@ def get_tor_modules(tor): ] try: mods = run_tor(cmdline) - except subprocess.CalledProcessError as e: + except subprocess.CalledProcessError: # Tor doesn't support --list-modules; act as if it said nothing. mods = "" diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py index d8918ee..2fae512 100755 --- a/lib/chutney/Traffic.py +++ b/lib/chutney/Traffic.py @@ -28,9 +28,7 @@ from __future__ import unicode_literals import sys import socket import struct -import errno import time -import os import asyncore import asynchat

1 0

[chutney/master] lint: Fix undefined names
by nickm＠torproject.org 15 May '20

15 May '20

commit 857c4705155182392620e5f62a8e09f9516e6507 Author: c <c(a)chroniko.jp> Date: Thu May 14 21:33:19 2020 +0000 lint: Fix undefined names Running flake8 on lib/chutney/*.py caught a few typographical errors and oversights. --- lib/chutney/Templating.py | 2 +- lib/chutney/TorNet.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/chutney/Templating.py b/lib/chutney/Templating.py index 2a658ab..43eb636 100755 --- a/lib/chutney/Templating.py +++ b/lib/chutney/Templating.py @@ -107,7 +107,7 @@ class _DictWrapper(object): self._parent = parent def _getitem(self, key, my): - raise NotImplemented() + raise NotImplementedError() def __getitem__(self, key): return self.lookup(key, self) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index b68b240..41390e6 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -67,7 +67,7 @@ def getenv_type(env_var, default, type_, type_name=None): type_name = str(type_) raise ValueError(("Invalid value for environment variable '{}': " "expected {}, but got '{}'") - .format(env_var, typename, strval)) + .format(env_var, type_name, strval)) def getenv_int(env_var, default): """ @@ -1757,7 +1757,7 @@ class LocalNodeController(NodeController): node_status = self.getNodeDirInfoStatus() if node_status: status_code, _, _, _ = node_status - return status_code == LocalDirectoryController.SUCCESS_CODE + return status_code == LocalNodeController.SUCCESS_CODE else: # Clients don't publish descriptors, so they are always ok. # (But we shouldn't print a descriptor status for them.) @@ -2020,7 +2020,7 @@ class Network(object): def _addRequirement(self, requirement): requirement = requirement.upper() if requirement not in KNOWN_REQUIREMENTS: - raise RuntimemeError(("Unrecognized requirement %r"%requirement)) + raise RuntimeError(("Unrecognized requirement %r"%requirement)) self._requirements.append(requirement) def move_aside_nodes_dir(self):

1 0

[stem/master] Disable buggy cross referencing
by atagar＠torproject.org 15 May '20

15 May '20

commit a22ebbda06cc38b4d0eeb358f9bb6f4a930086de Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 14 16:14:11 2020 -0700 Disable buggy cross referencing Sphinx attempts to create cross-references for attribute and variable names... https://github.com/sphinx-doc/sphinx/issues/2549 https://github.com/sphinx-doc/sphinx/issues/3866 This results in numerous warnings of the form... WARNING: more than one target found for cross-reference 'digest' Adapting a patch from the tickets above. Sphinx deprecated override_domain(), so using add_domain() instead... https://www.sphinx-doc.org/en/2.0/extdev/appapi.html#sphinx.application.Sph… --- docs/conf.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/docs/conf.py b/docs/conf.py index aef0ff93..b880b114 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -12,6 +12,7 @@ # serve to show the default. import sys, os +from sphinx.domains.python import PythonDomain # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -260,9 +261,35 @@ man_pages = [ trac_url = 'https://trac.torproject.org/{slug}' spec_url = 'https://gitweb.torproject.org/torspec.git/commit/?id={slug}' + def skip_members(app, what, name, obj, skip, options): if name in ('ATTRIBUTES', 'PARSER_FOR_LINE'): return True # skip the descriptor's parser constants + +class PythonDomainNoXref(PythonDomain): + """ + Sphinx attempts to create cross-reference links for variable names... + + https://github.com/sphinx-doc/sphinx/issues/2549 + https://github.com/sphinx-doc/sphinx/issues/3866 + + This causes alot of warnings such as... + + stem/descriptor/networkstatus.py:docstring of + stem.descriptor.networkstatus.DocumentDigest:: WARNING: more than one + target found for cross-reference 'digest': + stem.descriptor.extrainfo_descriptor.ExtraInfoDescriptor.digest, ... + """ + + def resolve_xref(self, env, fromdocname, builder, typ, target, node, contnode): + if 'refspecific' in node: + del node['refspecific'] + + return super(PythonDomainNoXref, self).resolve_xref( + env, fromdocname, builder, typ, target, node, contnode) + + def setup(app): app.connect('autodoc-skip-member', skip_members) + app.add_domain(PythonDomainNoXref, override = True)

1 0

[stem/master] Drop explicit __init__ from automodule
by atagar＠torproject.org 15 May '20

15 May '20

commit f99633ca62766f1f1c123132a75b745e255d26c4 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 13 15:56:07 2020 -0700 Drop explicit __init__ from automodule The only visible difference I can see between including '__init__' verses excluding it for automodule declarations is class names. If we include it the page cites classes as... stem.descriptor.__init__.DigestHash ... whereas without it the page renders... stem.descriptor.DigestHash The second is obviously correct so dropping the suffix. --- docs/api/descriptor/descriptor.rst | 2 +- docs/api/util/init.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api/descriptor/descriptor.rst b/docs/api/descriptor/descriptor.rst index 0273b535..b5b642c6 100644 --- a/docs/api/descriptor/descriptor.rst +++ b/docs/api/descriptor/descriptor.rst @@ -1,5 +1,5 @@ Descriptor ========== -.. automodule:: stem.descriptor.__init__ +.. automodule:: stem.descriptor diff --git a/docs/api/util/init.rst b/docs/api/util/init.rst index fae27191..651826f0 100644 --- a/docs/api/util/init.rst +++ b/docs/api/util/init.rst @@ -1,5 +1,5 @@ Util ==== -.. automodule:: stem.util.__init__ +.. automodule:: stem.util

1 0