summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'deftly' into 'main'Ian Jackson2024-04-0331-289/+271
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Switch to derive-deftly See merge request tpo/core/arti!2066
| * | | | | derive-deftly: Change some docs referencesIan Jackson2024-04-035-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Found by "git grep adhoc" and manual inspection.
| * | | | | Apply import alphabetisation churnIan Jackson2024-04-032-2/+2
| | | | | |
| * | | | | tor-rtmock: Remove a todo commentIan Jackson2024-04-031-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | derive-deftly 0.10.x rejects unrecognised `#[deftly]` attributes.
| * | | | | derive-deftly: Call pub_template_semver_checkIan Jackson2024-04-032-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new feature in d-d 0.10.0. Our currrent semver policy doesn't care about this, but let's not encode that property in the tree and leave ourselves a booby-trap.
| * | | | | Switch to derive-deftlyIan Jackson2024-04-0330-279/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the combination of a number of separate commits, many of which were generated by seddery, and then rebased and squashed. Cargo.toml perl -i~ -pe 's{^derive-adhoc}{derive-deftly = "0.10"}' crates/*/Cargo.toml (not regenerated during rebase) update Cargo.lock `cargo fetch` without --locked (regenerated during rebase) seddery git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{^use derive_adhoc}{use derive_deftly}' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\bdefine_derive_adhoc\b}{define_derive_deftly}g' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\bAdhoc\b}{Deftly}g if m{derive}' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\#\[derive_adhoc\b}{#[derive_deftly}g' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{use derive_adhoc}{use derive_deftly}' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\bderive_adhoc\b}{derive_deftly_adhoc} if m{use.*deftly}' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\bderive_adhoc!}{derive_deftly_adhoc!}' (not regenerated during rebase) Manually add `#[derive_deftly_adhoc]` where needed. seddery git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\#\[adhoc\b}{#[deftly}g' git-ls-files | grep '\.rs$' | xargs perl -i~ -pe 's{\bderive_adhoc_template}{derive_deftly_template}' (not regenerated during rebase) Manually fix up an import Manually update some builder attrs Manually fix up tor_rtmock::time_core This was missed in my seddery, due to me rebasing the branch and not redoing the seddery.
* | | | | | Merge branch 'finish-backoff-refactor' into 'main'Nick Mathewson2024-04-022-31/+126
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tor-hsservice: Use single_attempt_timeout in backoff Runner impl. Closes #1259 See merge request tpo/core/arti!2064
| * | | | | | tor-hsservice: Move optional timeout to optionally_timeout().Gabriela Moldovan2024-04-021-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prompted by https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2064#note_3014793
| * | | | | | tor-hsservice: s/timeout/overall_timeout for clarity.Gabriela Moldovan2024-04-021-2/+2
| | | | | | |
| * | | | | | tor-hsservice: Add a test for the backoff runner's single_attempt_timeout().Gabriela Moldovan2024-04-021-0/+51
| | | | | | |
| * | | | | | tor-hsservice: Use single_attempt_timeout in backoff Runner impl (fmt).Gabriela Moldovan2024-04-021-10/+10
| | | | | | |
| * | | | | | tor-hsservice: Use single_attempt_timeout in backoff Runner impl.Gabriela Moldovan2024-04-022-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | !2024 introduced `BackoffSchedule::single_attempt_timeout()`, partially implementing #1259. This completes the implementation by moving the per-iteration timeout from the publisher reactor to `backoff::Runner`. Addresses https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2024?commit_id=a4f2bf5cb7d4027a49b74ec5a5298f7b9a3cf62e#note_3005097 Note: the `if should_retry` block is intentionally misindented, to make reviewing the actual changes easier. A future commit will fix the indentation. I originally wanted to suggest reviewing this commit using `--ignore-space-change`, but I found that it makes things a bit confusing (it shows some funky indentation around the parts that have both whitespace changes and modifications). Closes #1259
* | | | | | | Merge branch 'loosen_check_licenses' into 'main'gabi-2502024-04-021-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove check_licenses exception for rustls-webpki See merge request tpo/core/arti!2070
| * | | | | | | Remove note about option-ext statusNick Mathewson2024-04-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They merged the suggested notice back May 2023: https://github.com/soc/option-ext/pull/4
| * | | | | | | Remove check_licenses exception for rustls-webpkiNick Mathewson2024-04-021-1/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | (They have declared their license as ISC, which is on our allow-list.)
* | | | | | | Merge branch 'unmanaged-proxy-config-test' into 'main'Nick Mathewson2024-04-024-10/+63
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test (and small cleanups) for Transport configuration Closes #1333 See merge request tpo/core/arti!2056
| * | | | | | | Add a test for transport configurationNick Mathewson2024-04-021-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Previously, nothing actually parsed these values in our configuration.) Closes #1333.
| * | | | | | | example-config: Indent transport argumentsNick Mathewson2024-04-021-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it possible for our tests to pull them out.
| * | | | | | | ptmgr: Use impl_standard_builder for TransportConfigNick Mathewson2024-04-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This is !Default, since there is no default TransportConfig.)
| * | | | | | | Make TorClientConfig implement AsRef<BridgesConfig>Nick Mathewson2024-04-021-0/+5
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | I believe this is how we expose the parts of TorClientConfig?
* | | | | | | Merge branch 'remove_unused_rebased' into 'main'Nick Mathewson2024-04-0222-103/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | remove unused dependencies See merge request tpo/core/arti!2068
| * | | | | remove unused dependenciestrinity-1686a2024-04-0222-103/+5
|/ / / / / | | | | | | | | | | | | | | | Edited-by: Nick Mathewson <[email protected]>
* | / / / Remove semver.md files from arti-1.2.1 releaseNick Mathewson2024-04-027-18/+0
| |/ / / |/| | |
* | | | Merge branch 'version_bumps_1_2_1' into 'main'arti-v1.2.1arti-1.2.1Nick Mathewson2024-04-0256-881/+789
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Version bumps for today's release See merge request tpo/core/arti!2065
| * | | | Run cargo update in {equix,hashx}/benchNick Mathewson2024-04-022-418/+326
| | | | |
| * | | | Bump arti crate to 1.2.1Nick Mathewson2024-04-024-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done with ``` cargo set-version -p arti --bump patch ```
| * | | | Update unstable `tor/arti-*` crates to 0.17.0.Nick Mathewson2024-04-0246-405/+405
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done with: ``` CRATES=" tor-basic-utils tor-async-utils tor-error tor-config tor-events tor-units tor-geoip tor-rtcompat tor-rtmock tor-log-ratelim tor-rpcbase tor-llcrypto tor-protover tor-bytes tor-hscrypto tor-hspow tor-socksproto tor-checkable tor-cert tor-linkspec tor-cell tor-proto tor-netdoc tor-consdiff tor-netdir tor-relay-selection tor-congestion tor-persist tor-chanmgr tor-ptmgr tor-guardmgr tor-circmgr tor-dirclient tor-dirmgr tor-keymgr tor-hsclient tor-hsservice tor-hsrproxy arti-client arti-rpcserver arti-config arti-hyper arti-bench arti-testing " for crate in $CRATES; do cargo set-version -p "$crate" 0.17.0 done ```
| * | | | Bump patchlevel versions on non-{tor/arti} crates.Nick Mathewson2024-04-0233-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These have all had backward-compatible changes. Generated with: ``` cargo set-version --bump patch -p fs-mistrust cargo set-version --bump patch -p test-temp-dir cargo set-version --bump patch -p fslock-guard cargo set-version --bump patch -p hashx cargo set-version --bump patch -p equix cargo set-version --bump patch -p caret cargo set-version --bump patch -p safelog cargo set-version --bump patch -p retry-error ```
* | | | | Merge branch 'changelog-1.2.1' into 'main'Nick Mathewson2024-04-021-0/+224
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Write a changelog for 1.2.1 See merge request tpo/core/arti!2059
| * | | | changelog: Add !2052 to note about coarsetime.Nick Mathewson2024-04-021-1/+2
| | | | |
| * | | | Small edits to changelog from reviewNick Mathewson2024-04-021-5/+3
| | | | |
| * | | | Note two more API breaks in the changelog.Nick Mathewson2024-04-011-0/+5
| | | | |
| * | | | Write a changelog for 1.2.1Nick Mathewson2024-03-281-1/+221
| | |/ / | |/| |
* | | | Merge branch 'cargo-update' into 'main'Nick Mathewson2024-04-023-279/+309
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Cargo update in preparation for upcoming release See merge request tpo/core/arti!2060
| * | | fixup-features: Update to avoid deprecations in latest toml_editNick Mathewson2024-04-012-6/+13
| | | | | | | | | | | | | | | | (Also, require a version of `toml_edit` that _has_ `DocumentMut`.)
| * | | Run "cargo update" in preparation for next releaseNick Mathewson2024-04-011-273/+296
| | | |
* | | | Merge branch 'time' into 'main'Ian Jackson2024-04-025-89/+147
|\ \ \ \ | |/ / / |/| | | | | | | | | | | tor-rtmock: Introduce MockTimeCore See merge request tpo/core/arti!2052
| * | | tor-rtmock: Change word in commentIan Jackson2024-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | This was incorrect usage, as pointed out in https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2052#note_3012727
| * | | tor-rtmock: Use MockTimeCore in time.rs too (fmt)Ian Jackson2024-03-251-6/+12
| | | |
| * | | tor-rtmock: Use MockTimeCore in time.rs tooIan Jackson2024-03-251-23/+18
| | | |
| * | | tor-rtmock: Introduce MockTimeCoreIan Jackson2024-03-252-25/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It bothered me that when I added a `MockCoarseTimeProvider` to the mock time providers, I had to manually grep to check that there weren't places the time was updated where I ought to also update the coarse time. Prove that the code is right by hiding all the times together in a struct that prevents un-synchronised updates. This is part 1, where we move the fields from simple_time::State to the new struct.
| * | | tor-rtmock: time_core: rename from coarse_time (fmt)Ian Jackson2024-03-251-1/+1
| | | |
| * | | tor-rtmock: time_core: rename from coarse_timeIan Jackson2024-03-254-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | We're going to put more in here. (Yes, I know we just invented this...)
* | | | Merge branch 'fixup-features-1.2.1' into 'main'Nick Mathewson2024-04-0115-7/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Run "fixup-features" in preparation for next release. See merge request tpo/core/arti!2061
| * | | | Run "fixup-features" in preparation for next release.Nick Mathewson2024-03-2815-7/+31
| | |/ / | |/| |
* | | | Merge branch 'downgrade-alpine-reproducible' into 'main'Nick Mathewson2024-03-292-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | downgrade alpine used for reproducible builds See merge request tpo/core/arti!2062
| * | | downgrade alpine used for reproducible buildstrinity-1686a2024-03-292-2/+2
|/ / / | | | | | | | | | temporary fix for broken macos builds
* | | Merge branch 'netdir-params-links' into 'main'Alexander Færøy2024-03-271-3/+3
|\ \ \ | | | | | | | | | | | | | | | | tor-netdir: Fix broken links in NetParameters docs. See merge request tpo/core/arti!2054
| * | | tor-netdir: Fix broken links in NetParameters docs.Gabriela Moldovan2024-03-261-3/+3
| | | | | | | | | | | | | | | | Spotted in https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2053#note_3012632
* | | | Merge branch 'yes-it-is-supported' into 'main'Alexander Færøy2024-03-271-1/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fix note in config that claimed onion services weren't implemented See merge request tpo/core/arti!2055