summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge branch 'reactor-confluxation' into 'main'gabi-2502025-02-279-610/+918
|\ \ \ \
| * | | | 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
| * | | | tor-proto: Rename Circuit variable to circ.Gabriela Moldovan2025-02-261-4/+4
| * | | | tor-proto: Avoid using Reactor in the circuit extender.Gabriela Moldovan2025-02-262-12/+9
| * | | | 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
| * | | | tor-proto: Avoid panicking on double CtrlMsg::Create.Gabriela Moldovan2025-02-252-16/+35
| * | | | 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
| * | | | 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
| * | | | tor-proto: Factor out stream management functionality.Gabriela Moldovan2025-02-252-21/+43
| * | | | tor-proto: Shuffle reactor impl in preparation for refactoring.Gabriela Moldovan2025-02-251-466/+466
| * | | | 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
| * | | | tor-proto: Add a reactor-internal Circuit type.Gabriela Moldovan2025-02-251-0/+38
| * | | | tor-proto: Add line breaks between impl blocks.Gabriela Moldovan2025-02-251-0/+4
| * | | | tor-proto: Implement From<Bug> for ReactorError.Gabriela Moldovan2025-02-251-1/+6
| | |/ / | |/| |
* | | | Merge branch 'release' into 'main'Nick Mathewson2025-02-271-4/+9
|\ \ \ \