Commit Graph

39060 Commits

Author SHA1 Message Date
David Goulet
4942358446 Merge branch 'maint-0.4.8' 2024-05-30 12:31:51 -04:00
Georg Koppen
928ba47ddf Update OverloadStatistics to match prop 328
Closes: #40940.
2024-05-30 12:31:45 -04:00
David Goulet
77f8bbcbbb Merge branch 'maint-0.4.8' 2024-05-30 12:30:44 -04:00
David Goulet
1b924c0d6c Merge branch 'ticket40689_048_01' into maint-0.4.8 2024-05-30 12:30:40 -04:00
David Goulet
5c0a0f7da0 Merge branch 'ticket40689_048_01' into 'main'
dirauth: Add new faravahar

Closes #40689

See merge request tpo/core/tor!819
2024-05-30 16:29:56 +00:00
David Goulet
475778bb2b Merge branch 'maint-0.4.8' 2024-05-30 09:51:52 -04:00
David Goulet
50800fa240 scripts: Fix Python3 warnings
Signed-off-by: David Goulet <dgoulet@torproject.org>
2024-05-30 09:51:48 -04:00
David Goulet
39ba9ce0d7 dirauth: Add new faravahar
Brand new address, brand new keys, brand new day.

Closes #40689

Signed-off-by: David Goulet <dgoulet@torproject.org>
2024-05-30 09:49:27 -04:00
David Goulet
93bb7fae42 Merge branch 'typos' into 'main'
fix a few comment typos

See merge request tpo/core/tor!818
2024-05-29 16:58:01 +00:00
Roger Dingledine
d990aba613 fix a few comment typos 2024-05-29 12:45:51 -04:00
David Goulet
7a5d94bcf8 Merge branch 'maint-0.4.8' 2024-04-30 15:34:11 -04:00
hiro
7708f9a4ea Fix typo in tor-relays list address 2024-04-30 15:34:07 -04:00
David Goulet
36cd4a50fc Merge branch 'maint-0.4.8' 2024-04-29 16:02:12 -04:00
David Goulet
e12a26e4d0 Merge branch 'm4-serial-fix' into 'main'
m4: update ax_check_compile_flag.m4 from autoconf-archive

See merge request tpo/core/tor!813
2024-04-29 20:00:44 +00:00
Alexander Færøy
815da5644a Merge branch 'changelogs' into 'main'
forward-port the 0.4.8.10 and .11 changelogs

See merge request tpo/core/tor!814
2024-04-23 17:51:16 +00:00
Roger Dingledine
9124e99dc5 fix changelog typos and clean up a bit 2024-04-19 08:18:48 -04:00
Sam James
8888e4ca6b
m4: update ax_check_compile_flag.m4 from autoconf-archive
I noticed this when doing some M4 macro analysis work, and saw
that the version of `ax_check_compile_flag.m4` in Tor has two serial
lines ('serial 5' and 'serial 6') which is invalid.

We could just fix one of the lines, but it makes more sense to just
sync with upstream, I think.

Import ax_check_compile_flag.m4 from autoconf-archive at latest
commit at time of writing (4e8aab846b0872fba99f1fe02ebcdff178a34c87).

Signed-off-by: Sam James <sam@gentoo.org>
2024-04-19 10:01:32 +01:00
David Goulet
a9d2977c1b Merge branch 'typos' into 'main'
Typos

See merge request tpo/core/tor!812
2024-04-18 13:27:15 +00:00
Roger Dingledine
a62438f746 forward-port the 0.4.8.10 and .11 changelogs 2024-04-18 09:10:03 -04:00
Roger Dingledine
f9624935bd typos in comments 2024-04-18 09:04:12 -04:00
Roger Dingledine
7b05befbcc fix syntax formatting in man page 2024-04-18 09:03:51 -04:00
David Goulet
a31c8c5818 Merge branch 'typo' into 'main'
typo

See merge request tpo/core/tor!811
2024-04-18 12:35:09 +00:00
trinity-1686a
881e0234e3 typo 2024-04-18 00:17:45 +02:00
David Goulet
bedc6a90d2 circuit: Remove log_warn triggered by a proto violation
Fixes #40932

Signed-off-by: David Goulet <dgoulet@torproject.org>
2024-04-16 13:49:42 -04:00
David Goulet
7ba70eeeea Merge branch 'count-log-bug' into 'main'
also consider LD_BUG logs when counting bug reached

Closes #40924

See merge request tpo/core/tor!805
2024-04-16 15:20:18 +00:00
David Goulet
a93759b46e Merge branch 'maint-0.4.8' 2024-04-15 15:11:30 -04:00
David Goulet
29e3601c42 Merge branch 'tor-gitlab/mr/808' into maint-0.4.8 2024-04-15 15:11:16 -04:00
David Goulet
612b801ea5 conflux: Don't process a closed circuit on get packaged window
Signed-off-by: David Goulet <dgoulet@torproject.org>
2024-04-15 14:45:29 -04:00
David Goulet
269b4561a1 conflux: Avoid noting a cell was sent on a closed circuit
It turns out that circuit_package_relay_cell() returns 0 in order to drop a
cell but there is a code path, if the circuit queue is full, that also silently
closes the circuit and returns 0.

This lead to Conflux thinking a cell was sent but actually the cell was not and
the circuit was closed leading to the hard assert.

And so this function makes sure that circuit_package_relay_cell() and
append_cell_to_circuit_queue() returns a value that indicate what happened with
the cell and circuit so the caller can make an informed decision with it.

This change makes it that we do NOT enter the Conflux subsystem if the cell is
not queued on the circuit.

Fixes #40921

Signed-off-by: David Goulet <dgoulet@torproject.org>
2024-04-15 14:24:45 -04:00
trinity-1686a
c84ea8bd0d rename metric bug_reached to bug_reached_count 2024-04-14 14:58:58 +02:00
trinity-1686a
e95375ec99 also consider LD_BUG logs when counting bug reached 2024-04-13 22:15:09 +02:00
David Goulet
0bd1df58d0 Merge branch 'maint-0.4.8' 2024-04-10 15:48:02 -04:00
Tor CI Release
6ebf436084 version: Bump version to 0.4.8.11-dev 2024-04-10 15:47:49 -04:00
David Goulet
c7046d1b74 Merge branch 'maint-0.4.8' 2024-04-10 13:06:15 -04:00
Tor CI Release
e04dfe6c1f version: Bump version to 0.4.8.11 2024-04-10 13:06:00 -04:00
David Goulet
94bcfd042b Merge branch 'maint-0.4.8' 2024-04-10 12:59:04 -04:00
Tor CI Release
461679e8c0 fallbackdir: Update list generated on April 10, 2024 2024-04-10 12:58:56 -04:00
Tor CI Release
3064d57712 Update geoip files to match ipfire location db, 2024/04/10. 2024-04-10 12:58:51 -04:00
David Goulet
deae11797a Merge branch 'maint-0.4.8' 2024-04-09 09:23:47 -04:00
David Goulet
e3e4fa35e8 dirauth: New keys and address for tor26
Signed-off-by: David Goulet <dgoulet@torproject.org>
2024-04-08 10:57:29 -04:00
David Goulet
51ef4ce094 test: Disable unit test causing issue with nightly package
Signed-off-by: David Goulet <dgoulet@torproject.org>
2024-03-20 09:23:24 -04:00
David Goulet
2d19050ef9 Merge branch 'testing-intro-rot' into 'main'
hs_service: don't force high intro point rotation for TestingTorNetwork

Closes #40922

See merge request tpo/core/tor!802
2024-03-14 17:41:54 +00:00
Jim Newsome
d224961609 hs_service: don't force high intro point rotation for TestingTorNetwork
This was previously added to facilitate testing intro point rotation
with chutney. However, the implementation is problematic since it forces
excessive rotation whenever TestingTorNetwork is enabled, and can't be
adjusted or disabled.

Alternatives for testing intro point rotation include:
 * Using shadow to "fast forward" time
 * Overriding the consensus parameters hs_intro_min_lifetime and
   hs_intro_max_lifetime.

Fixes #40922
2024-03-14 09:36:59 -05:00
David Goulet
d1e8c7a603 Merge branch 'dont-require-bandwidthcapacity' into 'main'
In router_is_active, don't require non-zero bandwidthcapacity

Closes #13000 and #40917

See merge request tpo/core/tor!801
2024-03-12 12:51:18 +00:00
Jim Newsome
4fc43ebdee In router_is_active, don't require non-zero bandwidthcapacity
This check was originally added in 962765a3, with the intent of
preventing relays with 0 measured bandwidth from being listed in the
consensus (part of fixing #13000).

Currently, that decision and other relevant places effectively use
`dirserv_get_credible_bandwidth_kb`, which prefers bwauth-measured
bandwidth over the self-reported `bandwidthcapacity`, making this check
mostly redundant.

i.e. this change should only affect behavior when the relay has uploaded
a descriptor with `bandwidthcapacity=0` *and* we have a non-zero
measured bandwidth, in which case we'll still trust the measured
bandwidth. This is what we want when bootstrapping a network (e.g. for
testing), since it allows us to initialize bandwidths using a bandwidth
authority file.

A relay can still cause `router_is_active` to return false by setting
the hibernate flag.

Also see discussion in #40917.

Fixes #40917.
2024-03-07 12:39:40 -06:00
Alexander Færøy
a5d53ce416 Merge branch 'document-read-until-eof' into 'main'
make read_file_to_str_until_eof doc more explicit

Closes #40852

See merge request tpo/core/tor!799
2024-02-28 16:56:24 +00:00
Alexander Færøy
72ac1de514 Merge branch 'maint-0.4.8' 2024-02-28 16:52:56 +00:00
trinity-1686a
e913de1bc6 make read_file_to_str_until_eof doc more explicit
the sz_out param is set to what was read (i.e not including the final
NULL the function adds for convenience), but could be understood to
be set to what was read+1 (including the NULL terminator)
2024-02-18 12:44:45 +01:00
David Goulet
b0b943a161 Merge branch 'bug40911' into 'main'
Make two 1-bit fields unsigned

Closes #40911

See merge request tpo/core/tor!796
2024-02-08 19:41:22 +00:00
Sebastian Hahn
6b665f25e2 Try to appease the changefile format checker 2024-02-06 19:52:44 +01:00