summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'lifetime' into 'main'opara2025-08-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | arti-client example: Write rather than hide an elided lifetime See merge request tpo/core/arti!3145
| * | | | | arti-client example: Write rather than hide an elided lifetimeIan Jackson2025-08-111-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes this warning. Not sure why it's not showing up in CI. --> crates/arti-client/examples/one_hop_circuit.rs:16:35 | 16 | fn find_one_hop_dir_cache(netdir: &NetDir) -> Option<Relay> { | ^^^^^^^ ----- the same lifetime is hidden here | | | the lifetime is elided here | = help: the same lifetime is referred to in inconsistent ways, making the signature confusing = note: `#[warn(mismatched_lifetime_syntaxes)]` on by default help: use `'_` for type paths | 16 | fn find_one_hop_dir_cache(netdir: &NetDir) -> Option<Relay<'_>> { | ++++
* | | | | Merge branch 'hyper-examples' into 'main'Ian Jackson2025-08-1110-103/+117
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | hyper-examples: Update examples for `hyper`. See merge request tpo/core/arti!2941
| * | | | hyper-examples: Run rustfmtIan Jackson2025-08-111-1/+3
| | | | |
| * | | | Merge branch 'main' into !2941Ian Jackson2025-08-11497-4493/+6543
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/hyper/hyper-http-client-example/Cargo.toml examples/hyper/hyper-http-hs-example/Cargo.toml In both cases, just the change of edition, which I have applied to examples/hyper-examples/Cargo.toml instead.
* | | | | Merge branch 'circ-react-report' into 'main'opara2025-08-073-18/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tor-proto: Use error report in tunnel/channel reactor mainloop Closes #2057 See merge request tpo/core/arti!3122
| * | | | | tor-proto: use error report in tunnel/channel reactorSteven Engler2025-08-073-18/+31
|/ / / / /
* | | | | Merge branch 'fix-cargo-fmt' into 'main'gabi-2502025-08-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | tor-proto: Fix failing cargo fmt See merge request tpo/core/arti!3140
| * | | | | tor-proto: fix failing cargo fmtSteven Engler2025-08-071-1/+1
| | | | | |
* | | | | | Merge branch 'note_result_flatten_msrv' into 'main'David Goulet2025-08-071-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Fix a comment about Result::flatten See merge request tpo/core/arti!3138
| * | | | | Fix a comment about Result::flattenNick Mathewson2025-08-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Previously this API was nightly-only; now it's in 1.89.
* | | | | | Merge branch 'enable-cgo' into 'main'Nick Mathewson2025-08-077-53/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable counter-galois onion negotiation and make it work. See merge request tpo/core/arti!3133
| * | | | | | proto: In CircuitExtender, derive relay crypt protocol from settings.Nick Mathewson2025-08-072-40/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a CGO bug: when extending circuits with ntorv3, we were never actually using CGO encryption for the newly constructed layer. This change also simplifies the code a bit, by un-parameterizing CircuitExtender a bit.
| * | | | | | Propagate cgo feature up to arti crate.Nick Mathewson2025-08-072-0/+8
| | | | | | |
| * | | | | | proto: List CGO-related features in supported_client_protocolsNick Mathewson2025-08-061-3/+9
| | | | | | |
| * | | | | | proto: Make CGO feature require CCNick Mathewson2025-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (We can't negotiate the one without the other.)
| * | | | | | proto: remove code that had disabled CGO.Nick Mathewson2025-08-061-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we can negotiate CC, we can negotiate CGO.
* | | | | | | Merge branch 'update_to_edition_2024_v2' into 'main'Nick Mathewson2025-08-07453-1580/+1905
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update code for Edition 2024 (second attempt) Closes #2101 See merge request tpo/core/arti!3137
| * | | | | | | Resolve a rustdoc warningNick Mathewson2025-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Future` is now in the prelude, so we don't have to give it an explicit path.
| * | | | | | | Revert confusing change to use of StreamExt::into_futureNick Mathewson2025-08-071-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're not sure why `cargo fix` did this, but it doesn't seem necessary.
| * | | | | | | Rename variables named "gen"Nick Mathewson2025-08-072-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now a reserved identifier. The automatic migration changed it to a raw identifier (`r#gen`), but it's better to use a different name.
| * | | | | | | Fix warnings and errors from edition 2024.Nick Mathewson2025-08-0714-82/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two main causes of errors were: - Since some of the lifetime rules have changed, we no longer need to do as many "bind a variable and immediately return it" patterns, and so clippy now warns about them. - We needed to adjust the explicit captures (`use<...>`) in a couple of our RPIT instances.
| * | | | | | | Switch Cargo.toml files to edition 2024.Nick Mathewson2025-08-07446-1435/+1747
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, run ``` git grep -l "^edition =" | xargs perl -i -pe 's/^edition *=.*/edition = "2024"/;' ``` Second, manually verify that all Cargo.toml files have changed, and nothing else has changed. Third, run cargo fmt again.
| * | | | | | | Update code for Edition 2024Nick Mathewson2025-08-0734-67/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Run cargo fix --edition 2. Selectively revert the "if let"->"match" changes. These changes are meant to protect us from the lifetime changes for "if let" bindings in Rust 2024. But we're not actually relying on the old lifetime rules anywhere, and the match syntax here is quite ugly. 3. Automatically revert `$pat:expr_2021` to `$pat:expr`. (We don't actually want to restrict the expression syntax that our macros accept). Done with `git grep -l expr_2021 | xargs perl -i -pe 's/expr_2021/expr/g;'` 4. Run cargo fmt.
* | | | | | | | Merge branch 'gsoc-integrity-check-sketch' into 'main'gabi-2502025-08-071-0/+169
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | doc: dev: notes: Add keys-integrity-check.md See merge request tpo/core/arti!3126
| * | | | | | | doc: dev: notes: Add keys-integrity-check.mdhjrgrn2025-08-071-0/+169
| | | | | | | |
* | | | | | | | Merge branch 'fix-quote' into 'main'David Goulet2025-08-071-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tor-protover: Small comment formatting fix See merge request tpo/core/arti!3136
| * | | | | | | | tor-protover: small comment formatting fixSteven Engler2025-08-061-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This breaks the syntax highlighting in vim for some reason and makes the file unreadable for me.
* | | | | | | | Merge branch 'improve-keys-list' into 'main'David Goulet2025-08-072-17/+88
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | arti: keys: Fix incorrect display of CTor keystore entries in `keys list` CLI See merge request tpo/core/arti!3116
| * | | | | | | doc: Update keys.mdhjrgrn2025-08-061-0/+24
| | | | | | | |
| * | | | | | | arti: keys: Improve CLI output by distinguishing KeyPath variantshjrgrn2025-08-061-17/+64
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * Update `display_entry` function to handle different `KeyPath` variants * Add functions `display_arti_entry` and `display_ctor_entry`
* | | | | | | Merge branch 'update-contributing-docs' into 'main'gabi-2502025-08-071-0/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | docs: Add safety note to README explaining that arti should always be built with `-p arti` See merge request tpo/core/arti!3134
| * | | | | | docs: add safety note to README (re: building arti)Steven Engler2025-08-061-0/+5
| |/ / / / /
* | | | | | Merge branch 'flowctrl_cc-is-supported' into 'main'Nick Mathewson2025-08-063-12/+30
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | tor_proto: add FLOWCTRL_CC to supported_client_protocols See merge request tpo/core/arti!3131
| * | | | obfs4-checker: do not enable tor-proto/experimental.Nick Mathewson2025-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. In general, it is always wrong to unconditionally depend on "experimental". Instead, a crate should depend on the particular experimental features it needs (if any). 2. obfs4-checker does not appear to need tor-proto/experimental any longer.
| * | | | arti-client: Fix test for FlowCtrl=2.Nick Mathewson2025-08-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | (It is possible for arti-client to have flowctl-cc disabled, but for tor-proto to have it enabled.)
| * | | | tor_proto: add FLOWCTRL_CC to supported_client_protocolsNick Mathewson2025-08-062-10/+28
|/ / / / | | | | | | | | | | | | | | | | Since we now allow it to be turned on, we can include it among our supported protocols.
* | | | Merge branch 'update-contributing-docs' into 'main'Ian Jackson2025-08-061-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | docs: Update contributing guide to explain gitlab issue See merge request tpo/core/arti!3121
| * | | | docs: reword contributing guide note about gitlabSteven Engler2025-08-051-7/+15
| | | | |
| * | | | docs: can't accept code contributions atmSteven Engler2025-08-041-0/+12
| | | | |
* | | | | Merge branch 'msrv-fixes' into 'main'Nick Mathewson2025-08-055-18/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve a few issues that had been waiting for an MSRV update. See merge request tpo/core/arti!3129
| * | | | | arti::socks: Resolve a TODO MSRV entry.Nick Mathewson2025-08-051-6/+3
| | | | | |
| * | | | | hsservice: copy our TODO about eventually replacing once_cell.Nick Mathewson2025-08-051-0/+8
| | | | | |
| * | | | | tor-cell: Check strictly-ascending property more efficientlyNick Mathewson2025-08-053-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had been planning to use `[]::is_sorted` here, once we had MSRV >= 1.82, but it turns out that we wanted strictly ascending sequence, whereas `is_sorted` checks for a non-descreasing sequence.
* | | | | | Merge branch 'prop362-fixups' into 'main'wesleyac2025-08-057-77/+289
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Fix a few TODOs for PoW See merge request tpo/core/arti!3106
| * | | | | tor-hsservice: cargo fmt.Wesley Aptekar-Cassels2025-08-051-1/+1
| | | | | |
| * | | | | tor-hsservice: Fix clippy lints.Wesley Aptekar-Cassels2025-08-051-2/+2
| | | | | |
| * | | | | tor-hsservice: Use saturating versions of time math functions.Wesley Aptekar-Cassels2025-08-051-1/+3
| | | | | |
| * | | | | tor-hsservice: Remove redundant check.Wesley Aptekar-Cassels2025-08-051-7/+1
| | | | | |
| * | | | | tor-hsservice: Don't panic on PoW main loop error.Wesley Aptekar-Cassels2025-08-051-5/+8
| | | | | |