summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'changelog-final' into 'main'arti-v1.4.1Nick Mathewson2025-03-031-5/+0
|\ | | | | | | | | Remove comment in changelog See merge request tpo/core/arti!2826
| * Remove comment in changelogNick Mathewson2025-03-031-5/+0
| |
* | Merge branch 'version-bumps' into 'main'Nick Mathewson2025-03-0353-494/+494
|\ \ | |/ |/| | | | | Bump versions for 1.4.1 release See merge request tpo/core/arti!2825
| * Bump arti to 1.4.1Nick Mathewson2025-03-034-4/+4
| |
| * Bump minor versions in tor-*, arti-*.Nick Mathewson2025-03-0350-484/+484
| |
| * Bump patchlevel for safelog, retry-error, test-temp-dir.Nick Mathewson2025-03-034-6/+6
|/ | | | | These crates have upgraded to a newer derive_more, and have had no other changes.
* Merge branch 'changelog-1.4.1' into 'main'Nick Mathewson2025-02-271-4/+125
|\ | | | | | | | | Changelog for Arti 1.4.1 See merge request tpo/core/arti!2814
| * Changelog for Arti 1.4.1 so far.Nick Mathewson2025-02-271-15/+91
| |
| * Start with our changelog template.Nick Mathewson2025-02-271-0/+47
| |
| * Apply format_md_links to previous CHANGELOG.Nick Mathewson2025-02-271-2/+2
| |
| * Drop a leftover sentence from the previous changelogNick Mathewson2025-02-271-2/+0
|/
* Merge branch 'cargo-update' into 'main'Nick Mathewson2025-02-273-113/+142
|\ | | | | | | | | cargo: Run 'cargo update' in preparation for release See merge request tpo/core/arti!2812
| * maint: downgrade dependencies in 'reproducible_build' scriptSteven Engler2025-02-271-0/+12
| | | | | | | | | | This is a workaround for https://gitlab.torproject.org/tpo/core/arti/-/issues/1335
| * maint: add 'Apache-2.0 AND ISC' as a recognized licenseSteven Engler2025-02-271-1/+3
| | | | | | | | | | | | | | | | | | This is for ring >= v0.17.10 We currently use two ring versions in our Cargo.lock: - 0.16.20 (old non-standard license) - 0.17.11 (new license)
| * cargo: run 'cargo update' in preparation for releaseSteven Engler2025-02-271-112/+127
|/
* Merge branch 'sync_datastream' into 'main'Nick Mathewson2025-02-273-6/+12
|\ | | | | | | | | | | | | Make DataStream, and its members, implement Sync. Closes #1859 See merge request tpo/core/arti!2808
| * Apply 1 suggestion(s) to 1 file(s)Nick Mathewson2025-02-271-1/+1
| | | | | | Co-authored-by: Ian Jackson <[email protected]>
| * Make DataStream, and its members, implement Sync.Nick Mathewson2025-02-263-6/+12
| | | | | | | | | | | | | | Also, use static_assertions to enforce that that they _stay_ Send+Sync. Closes #1859.
* | Merge branch 'keymgr-readme' into 'main'Ian Jackson2025-02-271-4/+8
|\ \ | | | | | | | | | | | | tor-keymgr: Minor README updates See merge request tpo/core/arti!2806
| * | tor-keymgr: Update README to mention the experimental features.Gabriela Moldovan2025-02-261-1/+2
| | |
| * | tor-keymgr: Update README to mention the new C Tor keystores.Gabriela Moldovan2025-02-261-3/+6
| | |
* | | Merge branch 'nocolor' into 'main'Ian Jackson2025-02-271-1/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | arti: Disable color when stdout is not a tty. Closes #1763 and #1862 See merge request tpo/core/arti!2802
| * | | arti: Disable color when stdout is not a tty.Nick Mathewson2025-02-241-1/+7
| | | | | | | | | | | | | | | | | | | | Closes #1763. Closes #1862.
* | | | Merge branch 'reactor-confluxation' into 'main'gabi-2502025-02-279-610/+918
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | tor-proto: Add ConfluxSet type in the reactor See merge request tpo/core/arti!2804
| * | | | tor-proto: Add _mut suffix to functions returning mutable circs (fmt).Gabriela Moldovan2025-02-261-1/+5
| | | | |
| * | | | tor-proto: Add _mut suffix to functions returning mutable circs.Gabriela Moldovan2025-02-263-20/+20
| | | | |
| * | | | tor-proto: s/legs/leg in variable name.Gabriela Moldovan2025-02-261-2/+2
| | | | |
| * | | | tor-proto: Add TODO about removing CtrlMsg::SendSendme.Gabriela Moldovan2025-02-261-0/+2
| | | | |
| * | | | tor-proto: Update misleading comment about SENDMEs.Gabriela Moldovan2025-02-261-1/+2
| | | | |
| * | | | tor-proto: Make the reactor shut down when all the legs close.Gabriela Moldovan2025-02-262-1/+17
| | | | |
| * | | | tor-proto: Simplify expression using is_ok_and.Gabriela Moldovan2025-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | As suggested by opara in https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2804#note_3165059
| * | | | tor-proto: Rename Circuit variable to circ.Gabriela Moldovan2025-02-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | It used to be a Reactor, but the `reactor` variable name no longer makes sense.
| * | | | tor-proto: Avoid using Reactor in the circuit extender.Gabriela Moldovan2025-02-262-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps us get rid of some unnecessary error handling. Prompted by https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2804#note_3165058
| * | | | tor-proto: Begin documenting the circuit removal behavior.Gabriela Moldovan2025-02-261-1/+17
| | | | |
| * | | | tor-proto: Forbid CtrlMsg::Extend* on multipath tunnels.Gabriela Moldovan2025-02-251-0/+20
| | | | | | | | | | | | | | | | | | | | We definitely don't want to ever allow this.
| * | | | tor-proto: Avoid panicking on double CtrlMsg::Create.Gabriela Moldovan2025-02-252-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, sending two `CtrlMsg::Create` to the reactor would cause it to panic. This makes it so that the double `Create` just leads to the caller receiving an error response via the completion channel. Note: this was not triggerable via the network, only via the tor-proto API. Moreover, the panic was unreachable from the public client API, because the `PendingClientCirc`/`ClientCirc` typestate makes it impossible to send a second `Create` (the `PendingClientCirc` becomes `ClientCirc` after the `Create` completes, and `PendingClientCirc` doesn't have an API for sending `Create` control messages to the reactor).
| * | | | tor-proto: Update docs to refer to Circuit instead of Reactor.Gabriela Moldovan2025-02-251-3/+3
| | | | |
| * | | | tor-proto: Add some more conflux-related TODOs.Gabriela Moldovan2025-02-251-0/+10
| | | | |
| * | | | tor-proto: Use a ConfluxSet in the circuit reactor.Gabriela Moldovan2025-02-254-48/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step toward supporting traffic splitting in the circuit reactor. While the logic has changed slightly to support handling circuits instead of just one, the reactor still only supports `ConfluxSet`s of size 1, so this should effectively be a no-op. In the future, this code will be extended to support the conflux-specific cells and to implement the conflux proto. The code uses `ConfluxSet::primary_leg()` and `ConfluxSet::single_leg()` somewhat interchangeably. This is not *currently* a problem because`primary_leg()` is the same as `single_leg()` for single path tunnels, but we will need to adjust some of these call sites when we add support for multipath tunnels (I have left a `TODO(conflux)` for every dubious call site). This commit also makes `CtrlMsg::FirstHopClockSkew` fallible: if the reactor is multipath, it will return `Err(Bug(..))` to the caller (this error is returned to the caller over the `answer` channel; it does *not* shut down the reactor)
| * | | | tor-proto: Add a ConfluxSet type.Gabriela Moldovan2025-02-254-0/+79
| | | | |
| * | | | tor-proto: Move most of the reactor impl to Circuit (fmt).Gabriela Moldovan2025-02-252-8/+24
| | | | |
| * | | | tor-proto: Move most of the reactor impl to Circuit.Gabriela Moldovan2025-02-254-70/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an intermediate step in rewriting the reactor to manage a "conflux set" (a set of linked circuits) rather than a single circuit. This commit contains no functional changes.
| * | | | tor-proto: Factor out stream management functionality.Gabriela Moldovan2025-02-252-21/+43
| | | | | | | | | | | | | | | | | | | | | | | | | These will soon be functions on `Circuit`, so it's a good time to pull them out of the reactor impl.
| * | | | tor-proto: Shuffle reactor impl in preparation for refactoring.Gabriela Moldovan2025-02-251-466/+466
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reorders the functions from the `Reactor` implementation in preparation for moving some of them to `Circuit`. This commit contains no functional changes and should be reviewed with `git diff --color-moved`. A future commit will move part of the `Reactor` impl block to `Circuit`.
| * | | | tor-proto: Move cell handlers into a separate type (fmt).Gabriela Moldovan2025-02-251-3/+10
| | | | |
| * | | | tor-proto: Move cell handlers into a separate type.Gabriela Moldovan2025-02-252-44/+56
| | | | | | | | | | | | | | | | | | | | | | | | | I am moving these handlers into a separate type because they'll need to be shared with the active `Circuit`, for handling incoming cells.
| * | | | tor-proto: Add a reactor-internal Circuit type.Gabriela Moldovan2025-02-251-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This represents a circuit "leg", in the conflux sense. The `Circuit` type will be a helper for implementing tunnel reactors that contain multiple `Circuit`s forming a conflux set. The fields from `Circuit` were extracted from the `Reactor` struct. A future commit will part of the `Reactor` implementation to `Circuit`.
| * | | | tor-proto: Add line breaks between impl blocks.Gabriela Moldovan2025-02-251-0/+4
| | | | | | | | | | | | | | | | | | | | For readability
| * | | | tor-proto: Implement From<Bug> for ReactorError.Gabriela Moldovan2025-02-251-1/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will soon have a `ConfluxSet` type. Some of its operations will return `Bug` (for example, the method for getting the *only* leg of the conflux set will return a `Bug` if the set has no legs, or more than 1 leg). This conversion function will make it easier these errors to `ReactorError`.
* | | | Merge branch 'release' into 'main'Nick Mathewson2025-02-271-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | maint: Update comments for RUSTSEC-2024-0384 exception See merge request tpo/core/arti!2813
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-26 17:14:57 +0000