summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * tor-keymgr: Use @ to annotate internal macro branches.Gabriela Moldovan2025-02-061-3/+3
| * tor-keymgr: Define the test key constants using a macro.Gabriela Moldovan2025-02-063-42/+85
| * tor-keymgr: Rename test constants to match file names.Gabriela Moldovan2025-02-063-30/+30
* | Merge branch 'bug1690' into 'main'Jim Newsome2025-02-063-18/+18
|\ \
| * | tor-proto: remove `use asynchronous_codec as futures_codec`Neel Chauhan2025-02-063-18/+18
|/ /
* | Merge branch 'reactor-refactor-2' into 'main'David Goulet2025-02-063-158/+209
|\ \ | |/ |/|
| * tor-proto: Make ControlHandler::handler return non-optional result.Gabriela Moldovan2025-02-062-14/+14
| * tor-proto: Turn some CtrlMsgs into CtrlCmds.Gabriela Moldovan2025-02-063-147/+166
| * tor-proto: Make shutdown a CtrlCmd.Gabriela Moldovan2025-02-063-26/+58
|/
* Merge branch 'update' into 'main'Ian Jackson2025-02-069-295/+361
|\
| * Upgrade to dirs 6Ian Jackson2025-02-053-14/+46
| * Upgrade to axum 8Ian Jackson2025-02-053-10/+9
| * Upgrade to downcast-rs 2Ian Jackson2025-02-055-6/+6
| * Routine cargo updateIan Jackson2025-02-051-267/+302
* | Merge branch 'conflux-sketch' into 'main'David Goulet2025-02-051-0/+141
|\ \
| * | doc: Add Conflux sketch dev notesDavid Goulet2025-02-051-0/+141
|/ /
* | Merge branch 'reactor-refactor-1' into 'main'gabi-2502025-02-058-432/+339
|\ \ | |/ |/|
| * proto: Fix feature gated importDavid Goulet2025-02-041-2/+5
| * proto: Move the begin cell handling into CircHopDavid Goulet2025-02-042-47/+38
| * proto: Move the close stream action into CircHopDavid Goulet2025-02-041-51/+55
| * proto: Remove ConversationInHandlerDavid Goulet2025-02-048-125/+9
| * proto: Introduce a reactor ControlHandlerDavid Goulet2025-02-042-223/+248
* | Merge branch 'rpclib-errors' into 'main'Nick Mathewson2025-02-046-30/+103
|\ \
| * | rpclib: Improve output for ConnectFailureNick Mathewson2025-02-042-2/+58
| * | rpclib: Include sources when formatting FFI errors.Nick Mathewson2025-02-041-2/+14
| * | rpclib: Obey error Display convention wrt sources.Nick Mathewson2025-02-044-26/+25
| * | tor-error: Implement ErrorReport for dyn StdError + 'static.Nick Mathewson2025-02-041-0/+6
| * | tor-error: Refor to the correct trait.Nick Mathewson2025-02-041-1/+1
| |/
* | Merge branch 'main' into 'main'opara2025-02-048-432/+380
|\ \ | |/ |/|
| * Rewrite download manager exampletidely2025-02-048-432/+380
|/
* Merge branch 'no-socketpair-for-you' into 'main'Nick Mathewson2025-02-035-5/+43
|\
| * rpclib: Move socketpair to a testing module; use it in llconn testsNick Mathewson2025-02-034-33/+39
| * rpclib: In tests, use an ersatz socketpair on windows.Nick Mathewson2025-02-032-3/+35
| * rpclib: make conn::complex use fewer iterations.Nick Mathewson2025-02-031-1/+1
* | Merge branch 'matrix-check-cleanup' into 'main'opara2025-02-031-26/+10
|\ \ | |/ |/|
| * maint: use `Crate.subdir` in matrix-checkSteven Engler2025-02-031-17/+1
| * maint: pass `Crate` to `test_crate` in matrix-checkSteven Engler2025-02-031-10/+10
|/
* Merge branch 'test_extend_ntor-fix' into 'main'David Goulet2025-02-031-1/+1
|\
| * tor-proto: Ensure rx end of chan reactor output sink is not dropped in test.Gabriela Moldovan2025-02-031-1/+1
* | Merge branch 'ahf/win32-rpc-fixes' into 'main'Nick Mathewson2025-02-031-1/+4
|\ \
| * | rpc: Fix test builds on Windows.Alexander Hansen Færøy2025-01-301-1/+4
* | | Merge branch 'vuln' into 'main'Ian Jackson2025-02-031-4/+4
|\ \ \
| * | | fix RUSTSEC-2025-0004Dimitris Apostolou2025-02-031-4/+4
|/ / /
* | | Merge branch 'ahf/docs-logo-fix' into 'main'opara2025-01-301-1/+1
|\ \ \ | |_|/ |/| |
| * | docs: Fix the logo path.Alexander Hansen Færøy2025-01-301-1/+1
* | | Merge branch 'rpc_document_internal_optimism' into 'main'Nick Mathewson2025-01-306-35/+23
|\ \ \
| * | | socks.rs: Update documentation; RpcDataStream has been renamed.Nick Mathewson2025-01-301-9/+5
| * | | rpc: Correct API documentation about optimismNick Mathewson2025-01-305-24/+1
| * | | rpc: Document what is actually going on with stream optimism.Nick Mathewson2025-01-301-2/+17
* | | | Merge branch 'proto-datactl-api-fixes2' into 'main'Nick Mathewson2025-01-305-35/+39
|\ \ \ \ | |_|/ / |/| | |