David Goulet
65a85a9d23
Merge branch 'maint-0.4.7'
2022-10-31 11:21:21 -04:00
David Goulet
19b080f2aa
Merge branch 'tor-gitlab/mr/646'
2022-10-28 12:07:51 -04:00
David Goulet
5db238f3e3
thread: Bump max detectable CPU from 16 to 128
...
Lets take advantage of those beefy machines ;).
Closes #40703
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-28 11:28:43 -04:00
Roger Dingledine
338185d840
resolve a BUG() on relays at startup
...
Remove a harmless "Bug" log message that can happen in
relay_addr_learn_from_dirauth() on relays during startup:
tor_bug_occurred_(): Bug: ../src/feature/relay/relay_find_addr.c:225: relay_addr_learn_from_dirauth: Non-fatal assertion !(!ei) failed. (on Tor 0.4.7.10 )
Bug: Tor 0.4.7.10: Non-fatal assertion !(!ei) failed in relay_addr_learn_from_dirauth at ../src/feature/relay/relay_find_addr.c:225. Stack trace: (on Tor 0.4.7.10 )
Finishes fixing bug 40231.
Fixes bug 40523; bugfix on 0.4.5.4-rc.
2022-10-27 20:07:48 -04:00
David Goulet
4481c1e609
Merge branch 'maint-0.4.7'
2022-10-27 11:42:10 -04:00
David Goulet
f09b913e18
Merge branch 'tor-gitlab/mr/645' into maint-0.4.7
2022-10-27 11:42:07 -04:00
David Goulet
3c58fa8a6f
Merge branch 'maint-0.4.7'
2022-10-27 11:41:48 -04:00
David Goulet
72f52d2c85
Merge branch 'tor-gitlab/mr/644' into maint-0.4.7
2022-10-27 11:41:43 -04:00
David Goulet
0918cc2783
Merge branch 'maint-0.4.7'
2022-10-27 11:41:26 -04:00
David Goulet
6d40e980fb
metrics: Treat relay connections as gauge, not counter
...
Fixes #40699
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-27 11:37:21 -04:00
Mike Perry
b30193416c
Changes file for 40683
2022-10-27 15:36:53 +00:00
Alexander Færøy
256339712d
Strip "__.SYMDEF*" before re-archiving in combine_libs on macOS and iOS.
...
This patch changes how combine_libs works on Darwin like platforms to
make sure we don't include any `__.SYMDEF` and `__.SYMDEF SORTED`
symbols on the archive before we repack and run ${RANLIB} on the
archive.
See: tpo/core/tor#40683.
2022-10-27 15:18:01 +00:00
David Goulet
504a6da5ab
changes: Update changes for ticket 40194
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-27 10:50:37 -04:00
David Goulet
177f3a40eb
metrics: Add number of opened circuits to MetricsPort
...
Related to #40194
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-27 10:48:52 -04:00
David Goulet
1a2d93f72a
relay: Add our consensus relay flag to MetricsPort
...
Related to #40194
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-27 10:48:52 -04:00
David Goulet
48ab17cc72
metrics: Add traffic related stats to MetricsPort
...
At this commit, bytes read and written are exported.
Related to #40194
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-27 10:48:48 -04:00
David Goulet
cd7be492d1
relay: Add DoS subsystem stats to MetricsPort
...
Related to #40194
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-27 10:47:56 -04:00
David Goulet
fff2b92682
Merge branch 'maint-0.4.7'
2022-10-27 10:46:54 -04:00
David Goulet
a1c40c8511
metrics: Fix naming and documentation
...
After nickm's review, minor changes to names and comments.
Related to #40194
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-27 10:45:08 -04:00
David Goulet
5f548f05d2
Merge branch 'tor-gitlab/mr/585'
2022-10-26 15:30:59 -04:00
David Goulet
dcbedc6c3f
Merge branch 'tor-gitlab/mr/596'
2022-10-26 15:27:03 -04:00
David Goulet
06a26f1872
relay: Change the connection metrics name
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 15:16:48 -04:00
David Goulet
00f714b374
relay: Add CC RTT reset stats to MetricsPort
...
Related to #40194
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 15:16:48 -04:00
David Goulet
e7e18ae914
relay: Add total number of streams seen on MetricsPort
...
Related to #40194
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 15:16:48 -04:00
David Goulet
98b98fd3ce
rephist: Track number of streams seen per type
...
Related to #40194
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 15:16:48 -04:00
David Goulet
8bf9c4be8d
Merge branch 'maint-0.4.7'
2022-10-26 15:13:00 -04:00
David Goulet
dd272b6ef4
Merge remote-tracking branch 'tor-gitlab/mr/638'
2022-10-26 15:12:54 -04:00
David Goulet
609a82a595
changes: Ticket 40694
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 15:10:41 -04:00
David Goulet
78c184d2fe
hs: Retry service rendezvous on circuit close
...
Move the retry from circuit_expire_building() to when the offending
circuit is being closed.
Fixes #40695
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 15:10:39 -04:00
David Goulet
5b44a32c59
circ: Get rid of hs_circ_has_timed_out
...
Logic is too convoluted and we can't efficiently apply a specific
timeout depending on the purpose.
Remove it and instead rely on the right circuit cutoff instead of
keeping this flagged circuit open forever.
Part of #40694
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 15:10:37 -04:00
David Goulet
88b5daf152
circ: Set proper timeout cutoff for HS circuits
...
Explicitly set the S_CONNECT_REND purpose to a 4-hop cutoff.
As for the established rendezvous circuit waiting on the RENDEZVOUS2,
set one that is very long considering the possible waiting time for the
service to get the request and join our rendezvous.
Part of #40694
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 15:10:34 -04:00
David Goulet
95f61cc84f
Merge branch 'maint-0.4.7'
2022-10-26 15:07:47 -04:00
David Goulet
fb21387882
Merge branch 'tor-gitlab/mr/637'
2022-10-26 15:07:42 -04:00
David Goulet
a7aa22a4e7
hs: Retry rdv circuit if repurposed
...
This can happen if our measurement subsystem decides to snatch it.
Fixes #40696
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 15:05:44 -04:00
David Goulet
ca135a127d
Merge branch 'maint-0.4.7'
2022-10-26 15:01:43 -04:00
David Goulet
0a49e04691
Merge branch 'tor-gitlab/mr/635' into maint-0.4.7
2022-10-26 15:01:40 -04:00
David Goulet
1720744904
Merge branch 'maint-0.4.7'
2022-10-26 14:58:25 -04:00
David Goulet
a2ee39452a
Merge branch 'tor-gitlab/mr/633'
2022-10-26 14:58:21 -04:00
David Goulet
59008c6f51
hs: Change the error for a collapsing client circuit
...
Change it to an "unreachable" error so the intro point can be retried
and not flagged as a failure and never retried again.
Closes #40692
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 14:56:45 -04:00
David Goulet
bb9f2ea8fb
Merge branch 'maint-0.4.7'
2022-10-26 14:21:41 -04:00
David Goulet
a317326aae
Merge branch 'maint-0.4.5' into maint-0.4.7
2022-10-26 14:21:41 -04:00
David Goulet
7a851e8983
Merge branch 'tor-gitlab/mr/631' into maint-0.4.5
2022-10-26 14:21:35 -04:00
David Goulet
efad436432
dirauth: Remove Faravahar
...
Closes #40688
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 14:20:07 -04:00
David Goulet
4a7824b9ae
Merge branch 'maint-0.4.7'
2022-10-26 14:12:51 -04:00
David Goulet
e19cf2dac6
Merge branch 'maint-0.4.5' into maint-0.4.7
2022-10-26 14:12:51 -04:00
David Goulet
b113b08722
Merge branch 'maint-0.4.7'
2022-10-26 14:07:49 -04:00
David Goulet
b20f72943e
Merge branch 'tor-gitlab/mr/629' into maint-0.4.7
2022-10-26 14:06:33 -04:00
David Goulet
f501564b40
relay: Reduce the minimum circuit cell in queue limit
...
With congestion control, the flow control window is much lower than the
initial 1000.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 14:05:28 -04:00
David Goulet
a2c034d8f5
dos: Apply circuit creation defenses if circ max queue cell reached
...
This adds two consensus parameters to control the outbound max circuit
queue cell size limit and how many times it is allowed to reach that
limit for a single client IP.
Closes #40680
Signed-off-by: David Goulet <dgoulet@torproject.org>
2022-10-26 14:05:28 -04:00
David Goulet
40aab72031
Merge branch 'tor-gitlab/mr/628'
2022-10-26 14:00:57 -04:00
