summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'conflux-cmds' into 'main'David Goulet2025-03-033-13/+73
|\ \ \ \
| * | | | tor-proto: Add CtrlCmd::ShutdownAndReturn circuit.Gabriela Moldovan2025-03-031-0/+18
| * | | | tor-proto: Add ConfluxSet method for taking the only leg in the set.Gabriela Moldovan2025-03-032-0/+28
| * | | | tor-proto: Use bad_api_usage! instead of internal! where applicable (fmt).Gabriela Moldovan2025-03-031-2/+6
| * | | | tor-proto: Use bad_api_usage! instead of internal! where applicable.Gabriela Moldovan2025-03-031-3/+3
| * | | | tor-proto: Factor out conflux set length check to new function (fmt).Gabriela Moldovan2025-03-031-6/+6
| * | | | tor-proto: Factor out conflux set length check to new function.Gabriela Moldovan2025-03-031-3/+13
| * | | | tor-proto: Use handle_shutdown() when handling CtrlCmd::Shutdown.Gabriela Moldovan2025-03-031-1/+1
* | | | | Merge branch 'rm-tor-congestion' into 'main'Nick Mathewson2025-03-038-35/+1
|\ \ \ \ \
| * | | | | tor-congestion: remove crateSteven Engler2025-03-038-35/+1
* | | | | | Merge branch 'rm-arc-mutex' into 'main'gabi-2502025-03-032-27/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | tor-proto: remove `Arc<AsyncMutex<_>>` in `Circuit::input`Steven Engler2025-03-032-27/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'ci-dependency-proxy' into 'main'wesleyac2025-03-031-10/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | CI: use Dependency Proxy when availableJérôme Charaoui2025-02-191-10/+19
* | | | | Merge branch 'conflux-poll-multiple' into 'main'gabi-2502025-03-032-64/+148
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | tor-proto: Document that ready_streams_iterator() is cancel-safe.Gabriela Moldovan2025-03-031-0/+2
| * | | | tor-proto: Add cancellation-safety note inside circuit_action().Gabriela Moldovan2025-03-031-0/+3
| * | | | tor-proto: Reduce select_biased! indentation.Gabriela Moldovan2025-02-271-21/+21
| * | | | tor-proto: Rename SelectResult to CircuitAction.Gabriela Moldovan2025-02-272-13/+13
| * | | | tor-proto: Rewrite reactor loop to read from all circuits.Gabriela Moldovan2025-02-272-55/+106
| * | | | tor-proto: Add a SelectResult::RemoveLeg command.Gabriela Moldovan2025-02-271-0/+6
| * | | | tor-proto: Add function for removing circuits from ConfluxSet.Gabriela Moldovan2025-02-271-1/+23
* | | | | Merge branch 'remove-semver' into 'main'opara2025-03-034-4/+0
|\ \ \ \ \
| * | | | | Remove semver files for 1.4.1Nick Mathewson2025-03-034-4/+0
* | | | | | Merge branch 'rm-async-block' into 'main'gabi-2502025-03-031-43/+40
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | tor-proto: Remove unnecessary async block (fmt).Gabriela Moldovan2025-02-271-42/+40
| * | | | | tor-proto: Remove unnecessary async block.Gabriela Moldovan2025-02-271-3/+2
| |/ / / /
* | | | | Merge branch 'changelog-final' into 'main'arti-v1.4.1Nick Mathewson2025-03-031-5/+0
|\ \ \ \ \
| * | | | | Remove comment in changelogNick Mathewson2025-03-031-5/+0
| | |_|/ / | |/| | |
* | | | | Merge branch 'version-bumps' into 'main'Nick Mathewson2025-03-0353-494/+494
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|/ / / /
* | | | Merge branch 'changelog-1.4.1' into 'main'Nick Mathewson2025-02-271-4/+125
|\ \ \ \
| * | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | maint: downgrade dependencies in 'reproducible_build' scriptSteven Engler2025-02-271-0/+12
| * | | maint: add 'Apache-2.0 AND ISC' as a recognized licenseSteven Engler2025-02-271-1/+3
| * | | 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
|\ \ \
| * | | Apply 1 suggestion(s) to 1 file(s)Nick Mathewson2025-02-271-1/+1
| * | | Make DataStream, and its members, implement Sync.Nick Mathewson2025-02-263-6/+12
* | | | Merge branch 'keymgr-readme' into 'main'Ian Jackson2025-02-271-4/+8
|\ \ \ \
| * | | | 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.Nick Mathewson2025-02-241-1/+7