summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'changelog-3' into 'main'arti-v1.4.0Ian Jackson2025-02-071-122/+162
|\
| * CHANGELOG.md: Run update-md-links to add final link blockIan Jackson2025-02-071-0/+104
| * CHANGELOG.md: Final edits for 1.4.0Ian Jackson2025-02-071-6/+3
| * CHANGELOG.md: Run maint/changelog-syntax-fiddleIan Jackson2025-02-071-119/+58
| * Merge branch 'main' into changelog-3-baseIan Jackson2025-02-0716-15/+17
| |\
* | | Merge branch 'changelog-2' into 'main'Ian Jackson2025-02-071-12/+41
|\| | | |/ |/|
| * CHANGELOG.md: Run update-md-linksIan Jackson2025-02-071-1/+5
| * CHANGELOG.md: Fix ref to prop324 into standard formatIan Jackson2025-02-071-1/+1
| * CHANGELOG.md: Set the headingIan Jackson2025-02-071-1/+1
| * CHANGELOG.md: Add AcknowledgementsIan Jackson2025-02-071-0/+12
| * CHANGELOG.md: Add missing trailing full stopsIan Jackson2025-02-071-10/+11
| * CHANGELOG.md: Document remaining changes in 1.4.0Ian Jackson2025-02-071-2/+14
* | Merge branch 'fs-mistrust' into 'main'Ian Jackson2025-02-0716-15/+17
|\ \ | |/ |/|
| * Bump minor version of fs-mistrustIan Jackson2025-02-0715-15/+15
| * CHANGELOG.md: Document that fs-mistrust has a breaking changeIan Jackson2025-02-071-0/+2
|/
* Merge branch 'changelog' into 'main'Ian Jackson2025-02-071-0/+251
|\
| * CHANGELOG.md: Fix TODO syntax to not aggravate CIIan Jackson2025-02-061-1/+1
| * CHANGELOG.md: Fix a method name typoIan Jackson2025-02-061-1/+1
| * CHANGELOG.md: Document most changes in 1.4.xIan Jackson2025-02-061-0/+251
|/
* Merge branch 'versions' into 'main'Ian Jackson2025-02-0650-501/+501
|\
| * Version bumps to 0.27.0Ian Jackson2025-02-0649-482/+482
| * Bump arti crate version to 1.4.0Ian Jackson2025-02-064-4/+4
| * fs-mistrust: bump minor version, and in-tree depsIan Jackson2025-02-0615-15/+15
* | Merge branch 'fixup-features' into 'main'Ian Jackson2025-02-068-2/+16
|\ \
| * | Fix Cargo.toml features formattingIan Jackson2025-02-067-7/+18
| * | Add some missing "full" featuresIan Jackson2025-02-068-7/+10
| |/
* | Merge branch 'file-watcher' into 'main'Ian Jackson2025-02-061-16/+22
|\ \
| * | file_watcher: Remove some now-unused thingsIan Jackson2025-02-061-8/+10
| * | file_watcher: Use .borrow_mut and sync MutexIan Jackson2025-02-061-10/+4
| * | file_watcher: Add some commentary about Event semanticsIan Jackson2025-02-061-0/+10
| |/
* | Merge branch 'key-file-macro' into 'main'gabi-2502025-02-065-60/+103
|\ \ | |/ |/|
| * 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