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

nickm pushed a commit to branch main in repository tor.

commit 6c1aad13e22d558b80463682f005d04bfdb2d162 Author: Nick Mathewson nickm@torproject.org AuthorDate: Thu Jun 16 11:50:59 2022 -0400

Fix `check-docs` to avoid false-positives on missing anchors.

Also add an anchor for the second ClientTranportPlugin instance.

See #40339.

This doesn't need a changes file because it isn't user-facing. --- doc/man/tor.1.txt | 2 +- scripts/maint/checkOptionDocs.pl.in | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 6a4afc0bbd..065324c104 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -335,7 +335,7 @@ forward slash (/) in the configuration file and on the command line. to mess with it. (Default: -1)

[[ClientTransportPlugin]] **ClientTransportPlugin** __transport__ socks4|socks5 __IP__:__PORT__:: -**ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]:: +[[ClientTransportPlugin-2]] **ClientTransportPlugin** __transport__ exec __path-to-binary__ [options]:: In its first form, when set along with a corresponding Bridge line, the Tor client forwards its traffic to a SOCKS-speaking proxy on "IP:PORT". (IPv4 addresses should written as-is; IPv6 addresses should be wrapped in diff --git a/scripts/maint/checkOptionDocs.pl.in b/scripts/maint/checkOptionDocs.pl.in index 2d4a7884f5..d2c2a838d6 100644 --- a/scripts/maint/checkOptionDocs.pl.in +++ b/scripts/maint/checkOptionDocs.pl.in @@ -41,9 +41,16 @@ loadTorrc("@abs_top_srcdir@/src/config/torrc.sample.in", %torrcSampleOptions); my $considerNextLine = 0; open(F, "@abs_top_srcdir@/doc/man/tor.1.txt") or die; while (<F>) { - if (m!^(?:[[([A-za-z0-9_]+)]] *)?**([A-Za-z0-9_]+)**!) { + if (m!^(?:[[([A-za-z0-9_]+)]] *)?**([A-Za-z0-9_]+)**! && $considerNextLine) { $manPageOptions{$2} = 1; print "Missing an anchor: $2\n" unless (defined $1 or $2 eq 'tor'); + $considerNextLine = 1; + } elsif (m!^\s*$! or + m!^\s*+\s*$! or + m!^\s*//!) { + $considerNextLine = 1; + } else { + $considerNextLine = 0; } } close F;

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

nickm pushed a commit to branch main in repository tor.

commit 0eb21427c95da6d67778080d3da0b858e077104a Author: Nick Mathewson nickm@torproject.org AuthorDate: Thu Jun 16 14:35:38 2022 -0400

Don't add redundant quotes with escaped() in log messages.

The escaped() function and its kin already wrap their output in quotes: there's no reason to do so twice.

I am _NOT_ making a corresponding change in calls that make the same mistake in controller-related functions, however, due to the risk of a compatibility break. :(

Closes #22723. --- changes/log-quotes | 3 +++ src/feature/dirauth/process_descs.c | 2 +- src/feature/relay/dns.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/changes/log-quotes b/changes/log-quotes new file mode 100644 index 0000000000..7c9308eb44 --- /dev/null +++ b/changes/log-quotes @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Avoid ""double-quoting"" strings in several log messages. + Fixes bug 22723; bugfix on 0.1.2.2-alpha. diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 7d61247e23..6a9cc5e95f 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -110,7 +110,7 @@ add_rsa_fingerprint_to_dir(const char *fp, authdir_config_t *list, tor_strstrip(fingerprint, " "); if (base16_decode(d, DIGEST_LEN, fingerprint, strlen(fingerprint)) != DIGEST_LEN) { - log_warn(LD_DIRSERV, "Couldn't decode fingerprint "%s"", + log_warn(LD_DIRSERV, "Couldn't decode fingerprint %s", escaped(fp)); tor_free(fingerprint); return -1; diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 4ae4a8e4b9..be226f4815 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -768,11 +768,11 @@ dns_resolve_impl,(edge_connection_t *exitconn, int is_resolve,

if (!is_reverse || !is_resolve) { if (!is_reverse) - log_info(LD_EXIT, "Bad .in-addr.arpa address "%s"; sending error.", + log_info(LD_EXIT, "Bad .in-addr.arpa address %s; sending error.", escaped_safe_str(exitconn->base_.address)); else if (!is_resolve) log_info(LD_EXIT, - "Attempt to connect to a .in-addr.arpa address "%s"; " + "Attempt to connect to a .in-addr.arpa address %s; " "sending error.", escaped_safe_str(exitconn->base_.address));