summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge branch 'socks-resolve-ip' into 'main'eta2023-01-061-15/+25
|\ \ \ \ \ \
| * | | | | | resolve ip through socks by parsing themtrinity-1686a2023-01-031-15/+25
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'ctbytes' into 'main'eta2023-01-064-39/+152
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add a new "CtByteArray" type, and use it in Id types.Nick Mathewson2023-01-054-39/+152
| | |_|_|/ | |/| | |
* | | | | Merge branch 'tor-rtmock-rfc3399' into 'main'Ian Jackson2023-01-043-2/+4
|\ \ \ \ \
| * | | | | Use parse_rfc3339() in the tor-rtmock crateNeel Chauhan2022-12-163-2/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'tor-proto-use-rfc3339' into 'main'Ian Jackson2023-01-041-1/+2
|\ \ \ \ \
| * | | | | Use parse_rfc3339() in the tor-proto crateNeel Chauhan2022-12-161-1/+2
| |/ / / /
* | | | | Merge branch 'tor-netdoc-rfc3399' into 'main'Ian Jackson2023-01-042-4/+5
|\ \ \ \ \
| * | | | | Use parse_rfc3339() in the tor-netdoc crateNeel Chauhan2022-12-162-4/+5
| |/ / / /
* | | | | Merge branch 'shadow-ci-tweaks' into 'main'Ian Jackson2023-01-042-15/+13
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | shadow ci: avoid hard coding tgen and tor bin pathsJim Newsome2022-12-192-11/+11
| * | | | shadow ci: only do pcap capture for bridge clientJim Newsome2022-12-191-4/+2
| | |/ / | |/| |
* | | | Merge branch 'architecture' into 'main'Nick Mathewson2022-12-2021-109/+57
|\ \ \ \
| * | | | doc: update the crate list in Architecture.mdEmil Engler2022-12-201-89/+37
| * | | | doc: consistent summary line for the READMEsEmil Engler2022-12-2020-20/+20
| |/ / /
* | | | Merge branch 'fix-links' into 'main'Nick Mathewson2022-12-202-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | doc: fix links to Architecture.mdEmil Engler2022-12-202-2/+2
|/ / /
* | | Merge branch 'bug608' into 'main'Nick Mathewson2022-12-194-6/+8
|\ \ \ | |/ / |/| |
| * | Add semver.md for (into_)handshake()Neel Chauhan2022-12-191-0/+2
| * | msg::{CreateFast/CreatedFast}: Rename accessor to (into_)body()Neel Chauhan2022-12-183-6/+6
|/ /
* | Merge branch 'err-dyn-report' into 'main'Ian Jackson2022-12-154-7/+51
|\ \
| * | tor-error: tests: Add a test case for Report and Bug wrappingIan Jackson2022-12-151-0/+11
| * | tor-circmgr: Use ErrorReport on a logged errorIan Jackson2022-12-121-1/+2
| * | tor-error: Provide ErrorReport extension trait with .report() methodIan Jackson2022-12-121-0/+32
| * | tor_error: Promote internal StdError alias to reportIan Jackson2022-12-121-5/+5
| * | tor-proto: reactor tests: Use debug fmt on an errorIan Jackson2022-12-121-1/+1
| |/
* | Merge branch 'typos' into 'main'Ian Jackson2022-12-141-1/+1
|\ \
| * | Fix typoDimitris Apostolou2022-12-121-1/+1
|/ /
* | Merge branch 'coral/#663' into 'main'Ian Jackson2022-12-129-13/+23
|\ \
| * | Tackling issue #663 (Use humantime in tests)coral2022-12-129-13/+23
|/ /
* | Merge branch 'sensitive-into-inner' into 'main'Ian Jackson2022-12-122-5/+21
|\ \ | |/ |/|
| * Rename Sensitive::into_inner() from ::unwrap()Ian Jackson2022-12-122-5/+21
|/
* Merge branch 'shadow-bridge' into 'main'Ian Jackson2022-12-1214-6/+95
|\
| * put ci log span magic strings in a dedicated scripttrinity-1686a2022-12-052-2/+15
| * verify leakage and run shadow with less shmtrinity-1686a2022-11-301-3/+21
| * add vanila bridge to shadow simtrinity-1686a2022-11-3011-2/+56
| * update shadow and install tsharktrinity-1686a2022-11-301-1/+5
* | Add another step to the release processNick Mathewson2022-12-101-0/+2
* | Merge branch 'typos' into 'main'Nick Mathewson2022-12-093-4/+4
|\ \
| * | Fix typosDimitris Apostolou2022-12-093-4/+4
|/ /
* | Merge branch 'doc-config-must' into 'main'Nick Mathewson2022-12-071-0/+60
|\ \
| * | tor-config: Document how to reject compiled-out featuresIan Jackson2022-12-061-0/+49
| * | tor-config: Add "particular situations" sections and mention list_builderIan Jackson2022-12-061-0/+11
* | | Merge branch 'shewllexpand' into 'main'Nick Mathewson2022-12-073-5/+11
|\ \ \
| * | | tor-config: Update to shellexpand 3.xIan Jackson2022-12-063-4/+8
| * | | tor-config: home dir handling: fmt pre-patchIan Jackson2022-12-061-1/+3
| |/ /
* | | Merge branch 'spelling-20221206' into 'main'Ian Jackson2022-12-064-15/+15
|\ \ \
| * | | arti-client: spelling fix.Nick Mathewson2022-12-061-1/+1
| * | | dirmgr: Spelling fixes and normali[sz]ationsNick Mathewson2022-12-063-14/+14