summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * arti: make "memquota" feature a no-opSteven Engler2025-07-314-34/+35
| * arti-client: make "memquota" feature a no-opSteven Engler2025-07-312-3/+12
| * arti-client: always enable "tor-memquota/memquota"Steven Engler2025-07-311-2/+1
|/
* Merge branch 'revised-redacted-api' into 'main'Nick Mathewson2025-07-3117-59/+249
|\
| * Use new DisplayRedacted/DebugRedacted code for HsId.Nick Mathewson2025-07-3116-58/+73
| * safelog: Add new DisplayRedacted/DebugRedacted APIs.Nick Mathewson2025-07-312-1/+176
|/
* Merge branch 'gsoc-ctor-migrate' into 'main'gabi-2502025-07-3115-47/+355
|\
| * arti: hss: Add `arti hss ctor-migrate`hjrgrn2025-07-3115-47/+355
|/
* Merge branch 'configuration-sources-pub' into 'main'Alexander Hansen Færøy2025-07-301-1/+1
|\
| * arti-client: Re-export `ConfigurationSources`Clara Engler2025-06-111-1/+1
* | Merge branch 'check-license-fix' into 'main'Nick Mathewson2025-07-302-7/+8
|\ \
| * | ci: Pin to cargo-license 0.7.0Nick Mathewson2025-07-301-2/+1
| * | check_licenses: treat LGPL-3.0/LGPL-3.0-only as synonymsNick Mathewson2025-07-301-5/+5
| * | check_licenses: allow sorted versions of some spdx exprsNick Mathewson2025-07-301-0/+2
|/ /
* | Merge branch 'license-workaround' into 'main'Nick Mathewson2025-07-301-1/+2
|\ \
| * | ci: downgrade cargo-license to 0.6.1 as workaroundSteven Engler2025-07-291-1/+2
|/ /
* | Merge branch 'conflux-set-cleanup' into 'main'David Goulet2025-07-283-61/+87
|\ \
| * | proto: Add test for ShutdownAndReturnCircuit error condition.Gabriela Moldovan2025-07-251-0/+47
| * | proto: Remove an already-addressed TODO.Gabriela Moldovan2025-07-251-2/+0
| * | proto: Remove element_idx + remove in favor of remove_unchecked().Gabriela Moldovan2025-07-251-11/+1
| * | proto: Replace hand-rolled exactly_one() impl with itertools.Gabriela Moldovan2025-07-252-52/+27
| * | proto: Add a ConfluxSet::remove_unchecked method.Gabriela Moldovan2025-07-251-0/+16
|/ /
* | Merge branch 'prop362' into 'main'wesleyac2025-07-233-64/+560
|\ \
| * | tor-hsservice: Fix doccomment link.Wesley Aptekar-Cassels2025-07-231-1/+1
| * | tor-hsservice: Add monotonic request id to RendRequestOrdByEffort.Wesley Aptekar-Cassels2025-07-231-4/+23
| * | tor-hsservice: Add note about SUGGESTED_EFFORT_DEADZONE.Wesley Aptekar-Cassels2025-07-231-0/+4
| * | tor-hsservice: Fix typo.Wesley Aptekar-Cassels2025-07-231-4/+4
| * | tor-hsservice: Remove remaining `as` casts from suggested effort update.Wesley Aptekar-Cassels2025-07-231-12/+23
| * | tor-hsservice: Remove another use of `as`.Wesley Aptekar-Cassels2025-07-233-3/+9
| * | tor-hsservice: Convert as into checked conversion.Wesley Aptekar-Cassels2025-07-231-1/+1
| * | tor-hsservice: Make num_dequeued u32 instead of usize.Wesley Aptekar-Cassels2025-07-231-2/+2
| * | tor-hsservice: Fix typos.Wesley Aptekar-Cassels2025-07-231-6/+6
| * | tor-hsservice: Use Mutex for suggested_effort.Wesley Aptekar-Cassels2025-07-231-16/+16
| * | tor-hsservice: Add tests for PowManager control loop.Wesley Aptekar-Cassels2025-07-231-21/+244
| * | tor-hsservice: Make PowManager generic over RendRequests.Wesley Aptekar-Cassels2025-07-231-12/+15
| * | tor-hsservice: Initial work towards mocking RendRequest.Wesley Aptekar-Cassels2025-07-231-24/+39
| * | tor-hsservice: Allow mocking PowManager.Wesley Aptekar-Cassels2025-07-231-4/+16
| * | tor-hsservice: Enforce maximum RendRequest queue size.Wesley Aptekar-Cassels2025-07-231-0/+12
| * | tor-hsservice: Update suggested effort in PowManager main loop.Wesley Aptekar-Cassels2025-07-231-1/+51
| * | tor-hsservice: Add suggested effort update function.Wesley Aptekar-Cassels2025-07-231-0/+63
| * | tor-hsservice: Give PowManager reference to RendRequestReceiver.Wesley Aptekar-Cassels2025-07-231-3/+8
| * | tor-hsservice: Allow constructing RendRequestReceiver without spawning.Wesley Aptekar-Cassels2025-07-231-19/+21
| * | tor-hsservice: Add state for prop362 update loop.Wesley Aptekar-Cassels2025-07-231-1/+45
| * | tor-hsservice: Change storage of PoW suggested_effort.Wesley Aptekar-Cassels2025-07-231-4/+21
| * | tor-hsservice: Implement PoW queue with BTreeSet.Wesley Aptekar-Cassels2025-07-231-6/+6
| * | tor-hsservice: RendRequestOrdByEffort use time as tiebreaker.Wesley Aptekar-Cassels2025-07-231-5/+15
|/ /
* | Merge branch 'cgo-integration' into 'main'Nick Mathewson2025-07-2310-82/+222
|\ \
| * | tor-proto: Temporary measure to disable CGO.Nick Mathewson2025-07-231-1/+11
| * | Downgrade an XXXX to a TODO.Nick Mathewson2025-07-231-1/+3
| * | Remove now-needless allow(unused).Nick Mathewson2025-07-231-1/+0