summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bump-versions-v115' into 'main'arti-v1.1.5Ian Jackson2023-06-0144-349/+349
|\
| * Bump crate versions in preparation for v1.1.5 release.Nick Mathewson2023-06-0144-349/+349
* | Merge branch 'one_more_cl_msg' into 'main'Nick Mathewson2023-06-011-0/+4
|\ \
| * | changelog: mention fallback list update.Nick Mathewson2023-06-011-0/+4
|/ /
* | Merge branch 'fallbackdir-2023-06-01' into 'main'Nick Mathewson2023-06-011-892/+896
|\ \ | |/ |/|
| * fallbackdir: Update list generated on June 01, 2023Tor CI Release2023-06-011-892/+896
|/
* Merge branch 'cl-more' into 'main'Nick Mathewson2023-06-011-7/+59
|\
| * changelog: Minor cleanupsNick Mathewson2023-06-011-3/+1
| * changelog: add links for 1.1.5 changelogNick Mathewson2023-06-011-4/+58
|/
* Merge branch 'changelog' into 'main'Alexander Færøy2023-05-311-0/+125
|\
| * Draft a changelog for 1.1.5Nick Mathewson2023-05-311-0/+125
* | Merge branch 'semver_checks_script' into 'main'gabi-2502023-05-311-0/+121
|\ \ | |/ |/|
| * New script to run cargo-semver-checks with appropriate options.Nick Mathewson2023-05-311-0/+121
|/
* Merge branch 'fixup-features' into 'main'Nick Mathewson2023-05-314-4/+9
|\
| * Run fixup-features script and resolve its complaints.Nick Mathewson2023-05-314-4/+9
|/
* Merge branch 'pre-release-updates' into 'main'Nick Mathewson2023-05-301-80/+71
|\
| * Run "cargo update" in preparation for Thursday release.Nick Mathewson2023-05-301-80/+71
|/
* Merge branch 'stream_ctrl' into 'main'Nick Mathewson2023-05-244-3/+238
|\
| * Add "TODO RPC" notes around DataStreamCtrl per review.Nick Mathewson2023-05-242-0/+16
| * proto: Add stream-status functionality to DataStreamCtrl.Nick Mathewson2023-05-241-2/+106
| * proto: Create a `DataStreamCtrl` type.Nick Mathewson2023-05-223-1/+114
| * proto: Add a new experimental stream-ctrl feature.Nick Mathewson2023-05-221-1/+2
| * tor-proto: Move a comment in Cargo.tomlNick Mathewson2023-05-221-1/+2
* | Merge branch 'virtual_conditional' into 'main'Ian Jackson2023-05-242-0/+3
|\ \
| * | proto: Make PathEntry::Virtual feature-conditional.Nick Mathewson2023-05-232-0/+3
* | | Merge branch 'rpc-auth-and-meta' into 'main'Nick Mathewson2023-05-248-114/+340
|\ \ \
| * | | rpc: Remove downgrade_owned for nowNick Mathewson2023-05-244-42/+0
| * | | rpc: Disable auth:get_rpc_protocol for now.Nick Mathewson2023-05-241-0/+8
| * | | rpc: Implement functionality to remove objects from a sessionNick Mathewson2023-05-245-5/+135
| * | | rpc: fix documentation for methods in Context.Nick Mathewson2023-05-241-6/+4
| * | | rpc: update rpc-meta-draft with new behavior.Nick Mathewson2023-05-241-3/+7
| * | | rpc: Make the top-level returned object a "session".Nick Mathewson2023-05-244-38/+67
| * | | rpc: Implement auth:query.Nick Mathewson2023-05-231-1/+39
| * | | rpc: Implement the auth:get_rpc_protocol method.Nick Mathewson2023-05-231-0/+49
| * | | rpc: move existing auth code to new module.Nick Mathewson2023-05-232-72/+84
* | | | Merge branch 'real_generational_arena' into 'main'Nick Mathewson2023-05-244-80/+34
|\ \ \ \
| * | | | rpc: Remove fake_generational_arenaNick Mathewson2023-05-233-79/+12
| * | | | maint/check_license: Make MPL-2.0 into an allow-listNick Mathewson2023-05-231-1/+22
* | | | | Merge branch 'cookie_in_est_intro' into 'main'Ian Jackson2023-05-242-6/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | cell: Make EstablishRendezvous contain a RendCookie.Nick Mathewson2023-05-232-6/+3
|/ / / /
* | | | Merge branch 'socks-read-fix' into 'main'Nick Mathewson2023-05-232-0/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix a local-only CPU DoS bug.Nick Mathewson2023-05-232-0/+25
* | | | Merge branch 'shadow-v3' into 'main'Nick Mathewson2023-05-234-21/+42
|\ \ \ \
| * | | | shadow-ci: check for successful transfers on bridge-client as wellJim Newsome2023-05-221-7/+9
| * | | | shadow ci: bump tgenJim Newsome2023-05-221-1/+1
| * | | | shadow ci: bump shadowJim Newsome2023-05-224-14/+33
| | |_|/ | |/| |
* | | | Merge branch 'thanks_trailer' into 'main'Ian Jackson2023-05-231-4/+28
|\ \ \ \ | |_|_|/ |/| | |
| * | | thanks: Also acknowledge Suggested-ByNick Mathewson2023-05-221-0/+2
| * | | maint/thanks: Split up some long pipelinesNick Mathewson2023-05-181-2/+9
| * | | maint/thanks: Remove email addresses from git trailersNick Mathewson2023-05-181-1/+1